update to only need java 21 and no older version

This commit is contained in:
alexcrea 2025-06-25 13:37:17 +02:00
parent 2a36ad945d
commit 97beb3ebe0
No known key found for this signature in database
GPG key ID: 027DD67D2D3280C5
17 changed files with 12 additions and 139 deletions

View file

@ -29,9 +29,6 @@ jobs:
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: | java-version: |
16
17
20
21 21
distribution: 'temurin' distribution: 'temurin'
cache: 'gradle' cache: 'gradle'

View file

@ -10,6 +10,4 @@ dependencies {
// Spigot api // Spigot api
compileOnly("org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT") compileOnly("org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT")
} }

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "16" sourceCompatibility = "16"

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "17"

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "17"

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "17"

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "17"

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "17"

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "18"
targetCompatibility = "17" targetCompatibility = "18"
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
@ -38,6 +30,6 @@ tasks.withType<JavaCompile>().configureEach {
kotlin { kotlin {
compilerOptions { compilerOptions {
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
jvmTarget.set(JvmTarget.JVM_17) jvmTarget.set(JvmTarget.JVM_18)
} }
} }

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "18"
targetCompatibility = "17" targetCompatibility = "18"
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
@ -38,6 +30,6 @@ tasks.withType<JavaCompile>().configureEach {
kotlin { kotlin {
compilerOptions { compilerOptions {
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
jvmTarget.set(JvmTarget.JVM_17) jvmTarget.set(JvmTarget.JVM_18)
} }
} }

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "18"
targetCompatibility = "17" targetCompatibility = "18"
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
@ -38,6 +30,6 @@ tasks.withType<JavaCompile>().configureEach {
kotlin { kotlin {
compilerOptions { compilerOptions {
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
jvmTarget.set(JvmTarget.JVM_17) jvmTarget.set(JvmTarget.JVM_18)
} }
} }

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "17" sourceCompatibility = "18"
targetCompatibility = "17" targetCompatibility = "18"
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
@ -38,6 +30,6 @@ tasks.withType<JavaCompile>().configureEach {
kotlin { kotlin {
compilerOptions { compilerOptions {
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
jvmTarget.set(JvmTarget.JVM_17) jvmTarget.set(JvmTarget.JVM_18)
} }
} }

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "21" sourceCompatibility = "21"

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "21" sourceCompatibility = "21"

View file

@ -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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "21" sourceCompatibility = "21"

View file

@ -16,16 +16,6 @@ dependencies {
repositories { repositories {
maven("https://repo.papermc.io/repository/maven-public/") 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 // Set target version

View file

@ -18,14 +18,6 @@ repositories {
maven("https://repo.papermc.io/repository/maven-public/") 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 // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = "21" sourceCompatibility = "21"