diff --git a/.github/workflows/publish-tag.yml b/.github/workflows/publish-tag.yml index 4a1a7c34..bc73d697 100644 --- a/.github/workflows/publish-tag.yml +++ b/.github/workflows/publish-tag.yml @@ -15,11 +15,11 @@ jobs: - name: Checkout latest code uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 17 + java-version: 21 - name: Change wrapper permissions run: chmod +x ./gradlew diff --git a/build.gradle.kts b/build.gradle.kts index e42c3ff0..716fb8bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,7 +64,7 @@ allprojects { compileKotlin { kotlinOptions { - jvmTarget = "17" + jvmTarget = "21" } } @@ -90,7 +90,7 @@ allprojects { } withType().configureEach { - options.release = 17 + options.release = 21 } } @@ -101,10 +101,3 @@ allprojects { } } } - -// Root is Java 21 to support 1.20.6+, rest use Java 17 -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 - withSourcesJar() -} diff --git a/eco-core/core-nms/v1_21/build.gradle.kts b/eco-core/core-nms/v1_21/build.gradle.kts index 118e82d2..9fe838c4 100644 --- a/eco-core/core-nms/v1_21/build.gradle.kts +++ b/eco-core/core-nms/v1_21/build.gradle.kts @@ -13,14 +13,4 @@ tasks { build { dependsOn(reobfJar) } - - compileJava { - options.release = 21 - } - - compileKotlin { - kotlinOptions { - jvmTarget = "21" - } - } } diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index caba981a..00000000 --- a/jitpack.yml +++ /dev/null @@ -1,6 +0,0 @@ -jdk: openjdk17 -before_install: - - source "$HOME/.sdkman/bin/sdkman-init.sh" - - sdk update - - sdk install java 17.0.1-tem - - sdk use java 17.0.1-tem \ No newline at end of file