build: update toolchain for refmap issues

FTBTeam · Jun 11, 2024 · 855ce17 · 855ce17
1 parent 8d353df
commit 855ce17
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
 }
 
 architectury {

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/api/Rank.java b/common/src/main/java/dev/ftb/mods/ftbranks/api/Rank.java
@@ -2,8 +2,8 @@
 
 import com.mojang.authlib.GameProfile;
 import net.minecraft.server.level.ServerPlayer;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Collection;
 
 /**

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/api/event/PermissionNodeChangedEvent.java b/common/src/main/java/dev/ftb/mods/ftbranks/api/event/PermissionNodeChangedEvent.java
@@ -3,8 +3,7 @@
 import dev.ftb.mods.ftbranks.api.PermissionValue;
 import dev.ftb.mods.ftbranks.api.Rank;
 import dev.ftb.mods.ftbranks.api.RankManager;
-
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class PermissionNodeChangedEvent extends RankEvent {
     private final String node;

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -46,18 +46,18 @@ processResources {
 
 shadowJar {
 	configurations = [project.configurations.shadowCommon]
-	classifier "dev-shadow"
+	setArchiveClassifier "dev-shadow"
 }
 
 remapJar {
 	input.set shadowJar.archiveFile
 	dependsOn shadowJar
 	archiveBaseName.set "${rootProject.archives_base_name}-${project.name}"
-	archiveClassifier.set null
+	setArchiveClassifier null
 }
 
 jar {
-	classifier "dev"
+	setArchiveClassifier "dev"
 }
 
 components.java {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -55,14 +55,14 @@ shadowJar {
 	exclude "fabric.mod.json"
 
 	configurations = [project.configurations.shadowCommon]
-	classifier "dev-shadow"
+	setArchiveClassifier "dev-shadow"
 }
 
 remapJar {
 	input.set shadowJar.archiveFile
 	dependsOn shadowJar
 	archiveBaseName.set "${rootProject.archives_base_name}-${project.name}"
-	archiveClassifier.set null
+	setArchiveClassifier null
 }
 
 jar {
@@ -78,7 +78,7 @@ jar {
 		])
 	}
 
-	classifier "dev"
+	setArchiveClassifier "dev"
 }
 
 components.java {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip