From a7830493b11338ce1a9b4fe1cdee86fc645859ea Mon Sep 17 00:00:00 2001
From: modmuss <modmuss50@gmail.com>
Date: Fri, 11 Oct 2024 15:19:40 +0100
Subject: [PATCH] Update to loom 1.8 (#4122)
* Trial loom 1.8
* Fix testmod jar classpath
* Update
---
build.gradle | 3 ++-
gradle.properties | 1 -
gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index ff615a391..db648dc20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
id "idea"
id "maven-publish"
id 'jacoco'
- id "fabric-loom" version "1.7.3" apply false
+ id "fabric-loom" version "1.8.8" apply false
id "com.diffplug.spotless" version "6.20.0"
id "org.ajoberstar.grgit" version "5.2.2"
id "me.modmuss50.remotesign" version "0.4.0" apply false
@@ -331,6 +331,7 @@ allprojects {
addNestedDependencies = false
includesClientOnlyClasses = true
clientOnlySourceSetName = sourceSets.testmodClient.name
+ classpath.from(sourceSets.testmodClient.compileClasspath)
}
build.dependsOn remapTestmodJar
diff --git a/gradle.properties b/gradle.properties
index 5cb8078e4..dd32ac78b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
-fabric.loom.multiProjectOptimisation=true
version=0.105.3
minecraft_version=1.21.2-pre3
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0aaefbcaf..df97d72b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME