Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2

# Conflicts: # fabric/build.gradle
shedaniel · Dec 12, 2023 · b98602f · b98602f
2 parents a5f690f + 64d2af8
commit b98602f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -55,6 +55,16 @@ remapJar {
     archiveClassifier = null
 }
 
+task renameJarForPublication(type: Zip, dependsOn: remapJar) {
+    from remapJar.archiveFile.map { zipTree(it) }
+    metadataCharset "UTF-8"
+    archiveExtension = "jar"
+    destinationDirectory = base.libsDirectory
+    archiveClassifier = project.name
+}
+
+assemble.dependsOn renameJarForPublication
+
 jar {
     archiveClassifier = "dev"
 }
@@ -110,7 +120,7 @@ unifiedPublishing {
         gameLoaders = ["fabric"]
         changelog = rootProject.releaseChangelog
 
-        mainPublication remapJar
+        mainPublication renameJarForPublication
 
         relations {
             depends {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -142,6 +142,16 @@ remapJar {
     archiveClassifier = null
 }
 
+task renameJarForPublication(type: Zip, dependsOn: remapJar) {
+    from remapJar.archiveFile.map { zipTree(it) }
+    metadataCharset "UTF-8"
+    archiveExtension = "jar"
+    destinationDirectory = base.libsDirectory
+    archiveClassifier = project.name
+}
+
+assemble.dependsOn renameJarForPublication
+
 jar {
     archiveClassifier = "dev"
 }
@@ -219,7 +229,7 @@ unifiedPublishing {
         gameLoaders = ["forge"]
         changelog = rootProject.releaseChangelog
 
-        mainPublication remapJar
+        mainPublication renameJarForPublication
 
         relations {
             depends {

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -79,6 +79,16 @@ remapJar {
     archiveClassifier = null
 }
 
+task renameJarForPublication(type: Zip, dependsOn: remapJar) {
+    from remapJar.archiveFile.map { zipTree(it) }
+    metadataCharset "UTF-8"
+    archiveExtension = "jar"
+    destinationDirectory = base.libsDirectory
+    archiveClassifier = project.name
+}
+
+assemble.dependsOn renameJarForPublication
+
 jar {
     archiveClassifier = "dev"
 }
@@ -156,7 +166,7 @@ unifiedPublishing {
         gameLoaders = ["neoforge"]
         changelog = rootProject.releaseChangelog
 
-        mainPublication remapJar
+        mainPublication renameJarForPublication
 
         relations {
             depends {