From 97beb3ebe023af766442e1ab56078f5c2ac044ba Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Wed, 25 Jun 2025 13:37:17 +0200 Subject: [PATCH] update to only need java 21 and no older version --- .github/workflows/gradle.yml | 3 --- impl/LegacyEcoEnchant/build.gradle.kts | 2 -- nms/v1_17R1/build.gradle.kts | 8 -------- nms/v1_18R1/build.gradle.kts | 8 -------- nms/v1_18R2/build.gradle.kts | 8 -------- nms/v1_19R1/build.gradle.kts | 8 -------- nms/v1_19R2/build.gradle.kts | 8 -------- nms/v1_19R3/build.gradle.kts | 8 -------- nms/v1_20R1/build.gradle.kts | 14 +++----------- nms/v1_20R2/build.gradle.kts | 14 +++----------- nms/v1_20R3/build.gradle.kts | 14 +++----------- nms/v1_20R4/build.gradle.kts | 14 +++----------- nms/v1_21R1/build.gradle.kts | 8 -------- nms/v1_21R2/build.gradle.kts | 8 -------- nms/v1_21R3/build.gradle.kts | 8 -------- nms/v1_21R4/build.gradle.kts | 10 ---------- nms/v1_21R5/build.gradle.kts | 8 -------- 17 files changed, 12 insertions(+), 139 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a57c071..e2d9ca6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -29,9 +29,6 @@ jobs: uses: actions/setup-java@v4 with: java-version: | - 16 - 17 - 20 21 distribution: 'temurin' cache: 'gradle' diff --git a/impl/LegacyEcoEnchant/build.gradle.kts b/impl/LegacyEcoEnchant/build.gradle.kts index a53c04c..1d8ddb1 100644 --- a/impl/LegacyEcoEnchant/build.gradle.kts +++ b/impl/LegacyEcoEnchant/build.gradle.kts @@ -10,6 +10,4 @@ dependencies { // Spigot api compileOnly("org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT") - - } \ No newline at end of file diff --git a/nms/v1_17R1/build.gradle.kts b/nms/v1_17R1/build.gradle.kts index 0480a4b..9a79bca 100644 --- a/nms/v1_17R1/build.gradle.kts +++ b/nms/v1_17R1/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// As minecraft 1.17 recommended java version is 1.16. we set language version to 1.16 - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "16" diff --git a/nms/v1_18R1/build.gradle.kts b/nms/v1_18R1/build.gradle.kts index cab1611..0ed9674 100644 --- a/nms/v1_18R1/build.gradle.kts +++ b/nms/v1_18R1/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// As minecraft 1.18 work with java 1.17 or above. we set language version to 1.17 - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "17" diff --git a/nms/v1_18R2/build.gradle.kts b/nms/v1_18R2/build.gradle.kts index 9f7c5a5..2cc9659 100644 --- a/nms/v1_18R2/build.gradle.kts +++ b/nms/v1_18R2/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// As minecraft 1.18 work with java 1.17 or above. we set language version to 1.17 - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "17" diff --git a/nms/v1_19R1/build.gradle.kts b/nms/v1_19R1/build.gradle.kts index b9a5a1a..ad7724c 100644 --- a/nms/v1_19R1/build.gradle.kts +++ b/nms/v1_19R1/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// I do not know minecraft 1.19 recommended java version. assumed 17 is good enough - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "17" diff --git a/nms/v1_19R2/build.gradle.kts b/nms/v1_19R2/build.gradle.kts index a4df488..6eff943 100644 --- a/nms/v1_19R2/build.gradle.kts +++ b/nms/v1_19R2/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// I do not know minecraft 1.19 recommended java version. assumed 17 is good enough - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "17" diff --git a/nms/v1_19R3/build.gradle.kts b/nms/v1_19R3/build.gradle.kts index 84476a3..23b6952 100644 --- a/nms/v1_19R3/build.gradle.kts +++ b/nms/v1_19R3/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// I do not know minecraft 1.19 recommended java version. assumed 17 is good enough - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "17" diff --git a/nms/v1_20R1/build.gradle.kts b/nms/v1_20R1/build.gradle.kts index e71d674..5426ff6 100644 --- a/nms/v1_20R1/build.gradle.kts +++ b/nms/v1_20R1/build.gradle.kts @@ -19,18 +19,10 @@ repositories { } -// minecraft 1.20 recommended java version is 18. but we assume 17 is good enough as lts - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { - sourceCompatibility = "17" - targetCompatibility = "17" + sourceCompatibility = "18" + targetCompatibility = "18" options.encoding = "UTF-8" } @@ -38,6 +30,6 @@ tasks.withType().configureEach { kotlin { compilerOptions { apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_18) } } diff --git a/nms/v1_20R2/build.gradle.kts b/nms/v1_20R2/build.gradle.kts index 47ebfce..40aa188 100644 --- a/nms/v1_20R2/build.gradle.kts +++ b/nms/v1_20R2/build.gradle.kts @@ -19,18 +19,10 @@ repositories { } -// minecraft 1.20 recommended java version is 18. but we assume 17 is good enough as lts - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { - sourceCompatibility = "17" - targetCompatibility = "17" + sourceCompatibility = "18" + targetCompatibility = "18" options.encoding = "UTF-8" } @@ -38,6 +30,6 @@ tasks.withType().configureEach { kotlin { compilerOptions { apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_18) } } diff --git a/nms/v1_20R3/build.gradle.kts b/nms/v1_20R3/build.gradle.kts index eb4d3c3..58aba26 100644 --- a/nms/v1_20R3/build.gradle.kts +++ b/nms/v1_20R3/build.gradle.kts @@ -19,18 +19,10 @@ repositories { } -// minecraft 1.20 recommended java version is 18. but we assume 17 is good enough as lts - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { - sourceCompatibility = "17" - targetCompatibility = "17" + sourceCompatibility = "18" + targetCompatibility = "18" options.encoding = "UTF-8" } @@ -38,6 +30,6 @@ tasks.withType().configureEach { kotlin { compilerOptions { apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_18) } } diff --git a/nms/v1_20R4/build.gradle.kts b/nms/v1_20R4/build.gradle.kts index 00f5c68..3b98361 100644 --- a/nms/v1_20R4/build.gradle.kts +++ b/nms/v1_20R4/build.gradle.kts @@ -19,18 +19,10 @@ repositories { } -// minecraft 1.20 recommended java version is 18. but we assume 17 is good enough as lts - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - // Set target version tasks.withType().configureEach { - sourceCompatibility = "17" - targetCompatibility = "17" + sourceCompatibility = "18" + targetCompatibility = "18" options.encoding = "UTF-8" } @@ -38,6 +30,6 @@ tasks.withType().configureEach { kotlin { compilerOptions { apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_18) } } diff --git a/nms/v1_21R1/build.gradle.kts b/nms/v1_21R1/build.gradle.kts index 435d09c..ba50b31 100644 --- a/nms/v1_21R1/build.gradle.kts +++ b/nms/v1_21R1/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// minecraft 1.21 java version is 21. - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "21" diff --git a/nms/v1_21R2/build.gradle.kts b/nms/v1_21R2/build.gradle.kts index 36dc7ac..f9bc521 100644 --- a/nms/v1_21R2/build.gradle.kts +++ b/nms/v1_21R2/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// minecraft 1.21 java version is 21. - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "21" diff --git a/nms/v1_21R3/build.gradle.kts b/nms/v1_21R3/build.gradle.kts index 19d2ffd..4a64d69 100644 --- a/nms/v1_21R3/build.gradle.kts +++ b/nms/v1_21R3/build.gradle.kts @@ -19,14 +19,6 @@ repositories { } -// minecraft 1.21 java version is 21. - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "21" diff --git a/nms/v1_21R4/build.gradle.kts b/nms/v1_21R4/build.gradle.kts index f72c165..1a1c8ee 100644 --- a/nms/v1_21R4/build.gradle.kts +++ b/nms/v1_21R4/build.gradle.kts @@ -16,16 +16,6 @@ dependencies { repositories { maven("https://repo.papermc.io/repository/maven-public/") - - mavenLocal()//TODO remove when paperDevBundle 1.21.5 release -} - -// minecraft 1.21 java version is 21. - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } // Set target version diff --git a/nms/v1_21R5/build.gradle.kts b/nms/v1_21R5/build.gradle.kts index 9483061..712c447 100644 --- a/nms/v1_21R5/build.gradle.kts +++ b/nms/v1_21R5/build.gradle.kts @@ -18,14 +18,6 @@ repositories { maven("https://repo.papermc.io/repository/maven-public/") } -// minecraft 1.21 java version is 21. - -// Configure used version of kotlin and java -java { - disableAutoTargetJvm() - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) -} - // Set target version tasks.withType().configureEach { sourceCompatibility = "21"