Bump to java 21

AlexProgrammerDE · Dec 18, 2024 · 3345a7b · 3345a7b
1 parent 1271a96
commit 3345a7b
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 30 deletions.
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)