fix java 21 building

kejonaMC · Jun 27, 2024 · 92f2bae · 92f2bae
1 parent 6ea1ddc
commit 92f2bae
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -62,11 +62,11 @@ allprojects{
 
 subprojects {
     dependencies {
-        testAnnotationProcessor("org.projectlombok:lombok:1.18.26")
-        testCompileOnly("org.projectlombok:lombok:1.18.26")
+        testAnnotationProcessor("org.projectlombok:lombok:1.18.30")
+        testCompileOnly("org.projectlombok:lombok:1.18.30")
         testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
 
-        annotationProcessor("org.projectlombok:lombok:1.18.26")
+        annotationProcessor("org.projectlombok:lombok:1.18.30")
         compileOnly("org.projectlombok:lombok:1.18.26")
         compileOnly("com.google.code.findbugs:jsr305:3.0.2") // nullability annotations
     }

diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    id("com.github.johnrengelman.shadow")
+    id("io.github.goooler.shadow")
 }
 
 dependencies {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Jun 27 05:04:38 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
     plugins {
         id("net.kyori.indra.git") version "3.0.1" // getting branch and commit info at compile time
         id("net.kyori.indra") version "3.0.1" // multi-release jar for referencing Java 16 geyser api
-        id("com.github.johnrengelman.shadow") version "7.1.2" // shadowing dependencies
+        id("io.github.goooler.shadow") version "8.1.7"// shadowing dependencies
     }
 }
 

diff --git a/spigot-common/v1_21_R1/build.gradle.kts b/spigot-common/v1_21_R1/build.gradle.kts
@@ -1,7 +1,7 @@
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 

diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
@@ -1,16 +1,16 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    id("com.github.johnrengelman.shadow")
+    id("io.github.goooler.shadow")
 }
 
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
-    api(projects.spigotCommon.v120R2) {
+    api(projects.spigotCommon.v121R1) {
         attributes {
             // hack - need to *include* the newer implementations
             // but still need this module to target the oldest java version (8)
-            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
         }
     }
 }

diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    id("com.github.johnrengelman.shadow")
+    id("io.github.goooler.shadow")
 }
 
 dependencies {