Bump to java 21

AlexProgrammerDE · AlexProgrammerDE · commit 3345a7bfa9dc · 2024-12-18T08:09:51.000+01:00
diff --git a/build-data/build.gradle.kts b/build-data/build.gradle.kts
@@ -4,8 +4,9 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
 sourceSets {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,21 +13,3 @@ tasks.create("outputVersion") {
         println(project.version)
     }
 }
-
-val platforms = setOf(
-    projects.pistonqueueBukkit,
-    projects.pistonqueueBungee,
-    projects.pistonqueueVelocity
-).map { it.dependencyProject }
-
-val special = setOf(
-    projects.pistonqueueUniversal,
-    projects.pistonqueueShared
-).map { it.dependencyProject }
-
-subprojects {
-    when (this) {
-        in platforms -> plugins.apply("pq.platform-conventions")
-        in special -> plugins.apply("pq.java-conventions")
-    }
-}
diff --git a/buildSrc/src/main/kotlin/pq.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/pq.java-conventions.gradle.kts
@@ -6,8 +6,9 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
 dependencies {
@@ -56,10 +57,10 @@ indra {
     }
 
     javaVersions {
-        target(17)
+        target(21)
         strictVersions()
-        testWith(17)
-        minimumToolchain(17)
+        testWith(21)
+        minimumToolchain(21)
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/pq.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/pq.shadow-conventions.gradle.kts
@@ -5,11 +5,6 @@ plugins {
     id("com.github.johnrengelman.shadow")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 tasks {
     jar {
         archiveClassifier.set("unshaded")
diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("pq.platform-conventions")
+}
+
 dependencies {
     implementation("org.bstats:bstats-bukkit:3.1.0")
 
diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("pq.platform-conventions")
+}
+
 dependencies {
     implementation(projects.pistonqueueShared)
 
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("pq.java-conventions")
+}
+
 dependencies {
     implementation("org.spongepowered:configurate-yaml:4.1.2")
     compileOnly("net.pistonmaster:pistonmotd-api:5.1.1")
diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts
@@ -1,5 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
+plugins {
+    id("pq.java-conventions")
+}
+
 val platforms = setOf(
     rootProject.projects.pistonqueueBukkit,
     rootProject.projects.pistonqueueBungee,
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("pq.platform-conventions")
+}
+
 dependencies {
     implementation(projects.pistonqueueShared)
     compileOnly(projects.pistonqueueBuildData)

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`java {`
`7`		`- sourceCompatibility = JavaVersion.VERSION_17`
`8`		`- targetCompatibility = JavaVersion.VERSION_17`
	`7`	`+ toolchain {`
	`8`	`+ languageVersion.set(JavaLanguageVersion.of(21))`
	`9`	`+ }`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,9 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`java {`
`9`		`- sourceCompatibility = JavaVersion.VERSION_17`
`10`		`- targetCompatibility = JavaVersion.VERSION_17`
	`9`	`+ toolchain {`
	`10`	`+ languageVersion.set(JavaLanguageVersion.of(21))`
	`11`	`+ }`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`dependencies {`
`@@ -56,10 +57,10 @@ indra {`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`javaVersions {`
`59`		`- target(17)`
	`60`	`+ target(21)`
`60`	`61`	`strictVersions()`
`61`		`- testWith(17)`
`62`		`- minimumToolchain(17)`
	`62`	`+ testWith(21)`
	`63`	`+ minimumToolchain(21)`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`