From f0222338f56c04ab8c200ae44af963be204d2f7c Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 4 Mar 2023 03:25:05 +0800
Subject: [PATCH] Update to Loom 1.1 and Gradle 8

---
 build.gradle                             |  4 ++--
 common/build.gradle                      |  3 ++-
 fabric/build.gradle                      | 10 +++++-----
 forge/build.gradle                       | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index fc0116eb..6808ab15 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,9 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.0-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
     id "org.cadixdev.licenser" version "0.6.1"
-    id "io.github.juuxel.loom-quiltflower" version "1.7.2" apply false
+    id "io.github.juuxel.loom-quiltflower" version "1.8.0" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id "maven-publish"
 }
diff --git a/common/build.gradle b/common/build.gradle
index 2d49ba6b..b780922a 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -44,7 +44,8 @@ import java.nio.file.Path
 task generateAccessWidener {
     doLast {
         List<String> lines = ["", "##############################", "# This section is generated automatically with Gradle task generateAccessWidener!!!", "##############################", ""]
-        Path inputJar = loom.namedMinecraftProvider.parentMinecraftProvider.mergedJar
+        Path inputJar = loom.namedMinecraftProvider.parentMinecraftProvider.mergedJar.path
+        logger.lifecycle("Generating access widener for $inputJar")
 
         try (def fs = FileSystems.newFileSystem(URI.create("jar:${inputJar.toUri()}"), [create: false])) {
             generateItemConstructors(lines, fs)
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 3b08b8e7..3506c632 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -45,28 +45,28 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier = "dev-shadow"
 }
 
 remapJar {
     injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    archiveClassifier = null
 }
 
 task renameJarForPublication(type: Zip, dependsOn: remapJar) {
     from remapJar.archiveFile.map { zipTree(it) }
-    extension "jar"
+    archiveExtension = "jar"
     metadataCharset "UTF-8"
     destinationDirectory = base.libsDirectory
-    classifier project.name
+    archiveClassifier = project.name
 }
 
 assemble.dependsOn renameJarForPublication
 
 jar {
-    classifier "dev"
+    archiveClassifier = "dev"
 }
 
 sourcesJar {
diff --git a/forge/build.gradle b/forge/build.gradle
index 98d166a7..423f8abf 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -48,7 +48,7 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier = "dev-shadow"
 
     // Replace classes with forge's version
     exclude "dev/architectury/core/block/ArchitecturyLiquidBlock.class"
@@ -65,21 +65,21 @@ shadowJar {
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    archiveClassifier = null
 }
 
 task renameJarForPublication(type: Zip, dependsOn: remapJar) {
     from remapJar.archiveFile.map { zipTree(it) }
-    extension "jar"
+    archiveExtension = "jar"
     metadataCharset "UTF-8"
     destinationDirectory = base.libsDirectory
-    classifier project.name
+    archiveClassifier = project.name
 }
 
 assemble.dependsOn renameJarForPublication
 
 jar {
-    classifier "dev"
+    archiveClassifier = "dev"
 }
 
 sourcesJar {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fce..f72df95a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists