Skip to content

feat: use java 17 for api components #1650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0utplay merged 7 commits into from
Jun 22, 2025
Merged

feat: use java 17 for api components #1650

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cfcd636
feat: use java 17 for our apis
0utplay Feb 7, 2025
6531ffb
fix: introduce separate aerogelApi bundle
GiantTreeLP Jun 7, 2025
768bd6b
fix: import ClassTransformer from correct package
GiantTreeLP Jun 7, 2025
2140afe
feat: actually use Java 17 for the APIs
GiantTreeLP Jun 7, 2025
21e84df
fix ClassTransformer import in AsmClassReaderTransformer
derklaro Jun 19, 2025
0b3cb6f
fix UnsafeTransformer
Jun 22, 2025
9b98b74
Update build.gradle.kts
derklaro Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,14 @@ subprojects {
}

tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_24.toString()
targetCompatibility = JavaVersion.VERSION_24.toString()
val javaVersion = if(project.path.contains("api")) JavaVersion.VERSION_17 else JavaVersion.VERSION_24
Comment thread
derklaro marked this conversation as resolved.
Outdated
sourceCompatibility = javaVersion.toString()
targetCompatibility = javaVersion.toString()

options.encoding = "UTF-8"
options.isIncremental = true

if (project.path != ":launcher:java8" && project.path != ":launcher:patcher") {
if (project.path != ":launcher:java8" && project.path != ":launcher:patcher" && !project.path.contains("api")) {
options.compilerArgs.add("--enable-preview")
options.compilerArgs.add("-Xlint:-deprecation,-unchecked,-preview")
options.compilerArgs.add("-proc:full")
Expand Down
2 changes: 1 addition & 1 deletion driver/api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ dependencies {
"api"(libs.vavr)
"api"(libs.slf4jApi)
"api"(libs.geantyref)
"api"(libs.bundles.aerogel)
"api"(libs.bundles.aerogelApi)
"implementation"(libs.guava)
}
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ checkstyleTools = { group = "com.puppycrawl.tools", name = "checkstyle", version
[bundles]

aerogel = ["aerogel", "aerogelScopedValues", "aerogelAuto"]
aerogelApi = ["aerogel", "aerogelAuto"]
npcLib = ["npcLib", "npcLibLabymod"]
unirest = ["unirest", "unirestGson"]
mysql = ["mysqlConnector", "hikariCp"]
Expand Down
4 changes: 0 additions & 4 deletions modules/cloudflare/api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,3 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

dependencies {
"compileOnly"(projects.utils.utilsBase)
}
4 changes: 2 additions & 2 deletions .../main/java/eu/cloudnetservice/modules/cloudflare/config/CloudflareConfigurationEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package eu.cloudnetservice.modules.cloudflare.config;

import eu.cloudnetservice.utils.base.StringUtil;
import java.util.Collection;
import java.util.Objects;
import java.util.UUID;
import lombok.NonNull;
import org.jetbrains.annotations.Nullable;

Expand All @@ -37,7 +37,7 @@ public record CloudflareConfigurationEntry(
public CloudflareConfigurationEntry {
// put in a random entry name if no name is given
if (entryName == null) {
entryName = StringUtil.generateRandomString(7);
entryName = UUID.randomUUID().toString().split("-")[0];
}
}

Expand Down
2 changes: 1 addition & 1 deletion wrapper-jvm/impl/src/main/java/eu/cloudnetservice/wrapper/impl/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import eu.cloudnetservice.driver.inject.InjectionLayer;
import eu.cloudnetservice.driver.registry.ServiceRegistry;
import eu.cloudnetservice.wrapper.transform.ClassTransformerRegistry;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformerRegistry;
import io.leangen.geantyref.TypeFactory;
import java.time.Instant;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion wrapper-jvm/impl/src/main/java/eu/cloudnetservice/wrapper/impl/Premain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package eu.cloudnetservice.wrapper.impl;

import eu.cloudnetservice.wrapper.impl.transform.ClassTransformerRegistry;
import eu.cloudnetservice.wrapper.impl.transform.DefaultClassTransformerRegistry;
import eu.cloudnetservice.wrapper.impl.transform.unsafe.UnsafeTransformer;
import eu.cloudnetservice.wrapper.transform.ClassTransformerRegistry;
import java.io.IOException;
import java.lang.instrument.Instrumentation;
import java.lang.reflect.Method;
Expand Down
4 changes: 2 additions & 2 deletions wrapper-jvm/impl/src/main/java/eu/cloudnetservice/wrapper/impl/Wrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
import eu.cloudnetservice.wrapper.impl.network.listener.message.GroupChannelMessageListener;
import eu.cloudnetservice.wrapper.impl.network.listener.message.ServiceChannelMessageListener;
import eu.cloudnetservice.wrapper.impl.network.listener.message.TaskChannelMessageListener;
import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.transform.ClassTransformerRegistry;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformerRegistry;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Provider;
Expand Down
2 changes: 1 addition & 1 deletion ...e/wrapper/transform/ClassTransformer.java → ...pper/impl/transform/ClassTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package eu.cloudnetservice.wrapper.transform;
package eu.cloudnetservice.wrapper.impl.transform;

import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
Expand Down
2 changes: 1 addition & 1 deletion ...r/transform/ClassTransformerRegistry.java → ...l/transform/ClassTransformerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package eu.cloudnetservice.wrapper.transform;
package eu.cloudnetservice.wrapper.impl.transform;

import lombok.NonNull;

Expand Down
2 changes: 0 additions & 2 deletions .../main/java/eu/cloudnetservice/wrapper/impl/transform/DefaultClassTransformerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package eu.cloudnetservice.wrapper.impl.transform;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.transform.ClassTransformerRegistry;
import jakarta.inject.Singleton;
import java.lang.classfile.ClassFile;
import java.lang.classfile.ClassHierarchyResolver;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/eu/cloudnetservice/wrapper/impl/transform/asm/AsmClassReaderTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.asm;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...a/eu/cloudnetservice/wrapper/impl/transform/bukkit/BukkitJavaVersionCheckTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.bukkit;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/eu/cloudnetservice/wrapper/impl/transform/bukkit/FAWEConfigTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.bukkit;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeTransform;
Expand Down
2 changes: 1 addition & 1 deletion ...java/eu/cloudnetservice/wrapper/impl/transform/bukkit/FAWEReflectionUtilsTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.bukkit;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeTransform;
Expand Down
2 changes: 1 addition & 1 deletion ...eu/cloudnetservice/wrapper/impl/transform/bukkit/FAWEWorldEditDownloadURLTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.bukkit;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeTransform;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/eu/cloudnetservice/wrapper/impl/transform/bukkit/PaperConfigTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.bukkit;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeTransform;
Expand Down
2 changes: 1 addition & 1 deletion ...a/eu/cloudnetservice/wrapper/impl/transform/bukkit/WorldEditJava8DetectorTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.bukkit;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeTransform;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/eu/cloudnetservice/wrapper/impl/transform/netty/OldEpollDisableTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.netty;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeTransform;
Expand Down
2 changes: 1 addition & 1 deletion ...a/eu/cloudnetservice/wrapper/impl/transform/spark/OldAsyncProfilerDisableTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package eu.cloudnetservice.wrapper.impl.transform.spark;

import eu.cloudnetservice.utils.base.StringUtil;
import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.ClassBuilder;
import java.lang.classfile.ClassElement;
import java.lang.classfile.ClassModel;
Expand Down
2 changes: 1 addition & 1 deletion ...mpl/src/main/java/eu/cloudnetservice/wrapper/impl/transform/unsafe/UnsafeTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.unsafe;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.lang.classfile.Annotation;
import java.lang.classfile.ClassBuilder;
import java.lang.classfile.ClassElement;
Expand Down
0 ...ervice.wrapper.transform.ClassTransformer → ...e.wrapper.impl.transform.ClassTransformer
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...src/test/java/eu/cloudnetservice/wrapper/impl/transform/unsafe/UnsafeTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package eu.cloudnetservice.wrapper.impl.transform.unsafe;

import eu.cloudnetservice.wrapper.transform.ClassTransformer;
import eu.cloudnetservice.wrapper.impl.transform.ClassTransformer;
import java.io.IOException;
import java.lang.classfile.ClassFile;
import org.junit.jupiter.api.Assertions;
Expand Down
Loading