Update to Loom 1.10

babric · Feb 14, 2025 · 355d3c0 · 355d3c0
1 parent c502408
commit 355d3c0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/publish-1.9-exp.yml → .github/workflows/publish-1.10-exp.yml b/.github/workflows/publish-1.9-exp.yml → .github/workflows/publish-1.10-exp.yml
@@ -1,9 +1,9 @@
-name: Publish 1.9 experimental
+name: Publish 1.10 experimental
 
 on:
   push:
     branches:
-      - "exp/1.9"
+      - "exp/1.10"
 
 jobs:
   build:

diff --git a/.github/workflows/publish-1.9.yml → .github/workflows/publish-1.10.yml b/.github/workflows/publish-1.9.yml → .github/workflows/publish-1.10.yml
@@ -1,9 +1,9 @@
-name: Publish 1.9
+name: Publish 1.10
 
 on:
   push:
     branches:
-      - "dev/1.9"
+      - "dev/1.10"
 
 jobs:
   build:

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 group = "babric"
 base.archivesName = project.name
-def baseVersion = "1.9"
+def baseVersion = "1.10"
 
 def ENV = System.getenv()
 
@@ -43,7 +43,7 @@ dependencies {
     implementation(gradleApi())
 
     implementation("net.fabricmc:fabric-loom:${loomVersion}")
-    compileOnly("net.fabricmc:mapping-io:0.6.1")
+    compileOnly("net.fabricmc:mapping-io:0.7.1")
     api("babric:stitch:0.6.2-babric.1")
 
     testImplementation(platform("org.junit:junit-bom:5.9.1"))
@@ -94,18 +94,18 @@ publishing {
         if (!ENV.containsKey("EXPERIMENTAL") && !ENV.EXPERIMENTAL) {
             // Also publish a snapshot so people can use the latest version if they wish
             snapshot(MavenPublication) { publication ->
-                groupId project.group
-                artifactId project.base.archivesName.get()
-                version baseVersion + '-SNAPSHOT'
+                groupId = project.group
+                artifactId = project.base.archivesName.get()
+                version = baseVersion + '-SNAPSHOT'
 
                 from components.java
             }
 
             // Manually crate the plugin marker for snapshot versions
             snapshotPlugin(MavenPublication) { publication ->
-                groupId 'babric-loom-extension'
-                artifactId 'babric-loom-extension.gradle.plugin'
-                version baseVersion + '-SNAPSHOT'
+                groupId = 'babric-loom-extension'
+                artifactId = 'babric-loom-extension.gradle.plugin'
+                version = baseVersion + '-SNAPSHOT'
 
                 pom.withXml({
                     // Based off org.gradle.plugin.devel.plugins.MavenPluginPublishPlugin

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Mar 21 21:38:16 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/babric/processor/GambacLibraryProcessor.java b/src/main/java/babric/processor/GambacLibraryProcessor.java
@@ -11,7 +11,6 @@
 import net.fabricmc.loom.configuration.providers.minecraft.library.LibraryProcessor;
 import net.fabricmc.loom.util.Platform;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.dsl.RepositoryHandler;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;

diff --git a/src/main/java/babric/processor/LWJGL2LibraryProcessor.java b/src/main/java/babric/processor/LWJGL2LibraryProcessor.java
@@ -8,7 +8,6 @@
 import net.fabricmc.loom.configuration.providers.minecraft.library.LibraryContext;
 import net.fabricmc.loom.configuration.providers.minecraft.library.LibraryProcessor;
 import net.fabricmc.loom.util.Platform;
-import org.gradle.api.artifacts.dsl.RepositoryHandler;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;

diff --git a/test-mod/build.gradle b/test-mod/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version "1.9-SNAPSHOT"
+	id 'fabric-loom' version "1.10-SNAPSHOT"
 	id 'maven-publish'
 	id 'babric-loom-extension'
 }

diff --git a/test-mod/gradle/wrapper/gradle-wrapper.properties b/test-mod/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME