Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21

shedaniel · shedaniel · commit 7dd362775695 · 2024-10-26T17:05:30.000+08:00
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -100,16 +100,17 @@ publishing {
                 publication.artifactId = rootProject.name + "-" + projectName + "-fabric"
                 project.afterEvaluate {
                     def project = project(":" + projectName)
-                    publication.artifact(project.fakeJar) { classifier null }
+                    def normalArtifact, sourceArtifact
+                    publication.artifact(project.fakeJar) { classifier null; normalArtifact = it }
                     def remapSourcesJarTask = project.remapSourcesJar
                     publication.artifact(remapSourcesJarTask) {
                         builtBy remapSourcesJarTask
                         classifier "sources"
+                        sourceArtifact = it
                     }
 
-                    // Hack to inherit the dependencies without inheriting the artifacts
-                    publication.setArtifacts(publication.artifacts)
                     from components.java
+                    publication.setArtifacts([normalArtifact, sourceArtifact])
                 }
             }
         }
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -210,15 +210,16 @@ publishing {
                 project.afterEvaluate {
                     def project = project(":" + projectName)
                     remapSrg.inputFile = project.fakeForgeJar.archiveFile
-                    publication.artifact(remapSrg) { classifier null }
+                    def normalArtifact, sourceArtifact
+                    publication.artifact(remapSrg) { classifier null; normalArtifact = it }
                     publication.artifact(remapSrgSourcesJar) {
                         builtBy remapSrgSourcesJar
                         classifier "sources"
+                        sourceArtifact = it
                     }
 
-                    // Hack to inherit the dependencies without inheriting the artifacts
-                    publication.setArtifacts(publication.artifacts)
                     from components.java
+                    publication.setArtifacts([normalArtifact, sourceArtifact])
                 }
             }
         }
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -147,15 +147,16 @@ publishing {
                 project.afterEvaluate {
                     def project = project(":" + projectName)
                     remapMojang.inputFile = project.fakeForgeJar.archiveFile
-                    publication.artifact(remapMojang) { classifier null }
+                    def normalArtifact, sourceArtifact
+                    publication.artifact(remapMojang) { classifier null; normalArtifact = it }
                     publication.artifact(remapMojangSourcesJar) {
                         builtBy remapMojangSourcesJar
                         classifier "sources"
+                        sourceArtifact = it
                     }
 
-                    // Hack to inherit the dependencies without inheriting the artifacts
-                    publication.setArtifacts(publication.artifacts)
                     from components.java
+                    publication.setArtifacts([normalArtifact, sourceArtifact])
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -100,16 +100,17 @@ publishing {`
`100`	`100`	`publication.artifactId = rootProject.name + "-" + projectName + "-fabric"`
`101`	`101`	`project.afterEvaluate {`
`102`	`102`	`def project = project(":" + projectName)`
`103`		`- publication.artifact(project.fakeJar) { classifier null }`
	`103`	`+ def normalArtifact, sourceArtifact`
	`104`	`+ publication.artifact(project.fakeJar) { classifier null; normalArtifact = it }`
`104`	`105`	`def remapSourcesJarTask = project.remapSourcesJar`
`105`	`106`	`publication.artifact(remapSourcesJarTask) {`
`106`	`107`	`builtBy remapSourcesJarTask`
`107`	`108`	`classifier "sources"`
	`109`	`+ sourceArtifact = it`
`108`	`110`	`}`
`109`	`111`
`110`		`- // Hack to inherit the dependencies without inheriting the artifacts`
`111`		`- publication.setArtifacts(publication.artifacts)`
`112`	`112`	`from components.java`
	`113`	`+ publication.setArtifacts([normalArtifact, sourceArtifact])`
`113`	`114`	`}`
`114`	`115`	`}`
`115`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,15 +210,16 @@ publishing {`
`210`	`210`	`project.afterEvaluate {`
`211`	`211`	`def project = project(":" + projectName)`
`212`	`212`	`remapSrg.inputFile = project.fakeForgeJar.archiveFile`
`213`		`- publication.artifact(remapSrg) { classifier null }`
	`213`	`+ def normalArtifact, sourceArtifact`
	`214`	`+ publication.artifact(remapSrg) { classifier null; normalArtifact = it }`
`214`	`215`	`publication.artifact(remapSrgSourcesJar) {`
`215`	`216`	`builtBy remapSrgSourcesJar`
`216`	`217`	`classifier "sources"`
	`218`	`+ sourceArtifact = it`
`217`	`219`	`}`
`218`	`220`
`219`		`- // Hack to inherit the dependencies without inheriting the artifacts`
`220`		`- publication.setArtifacts(publication.artifacts)`
`221`	`221`	`from components.java`
	`222`	`+ publication.setArtifacts([normalArtifact, sourceArtifact])`
`222`	`223`	`}`
`223`	`224`	`}`
`224`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,15 +147,16 @@ publishing {`
`147`	`147`	`project.afterEvaluate {`
`148`	`148`	`def project = project(":" + projectName)`
`149`	`149`	`remapMojang.inputFile = project.fakeForgeJar.archiveFile`
`150`		`- publication.artifact(remapMojang) { classifier null }`
	`150`	`+ def normalArtifact, sourceArtifact`
	`151`	`+ publication.artifact(remapMojang) { classifier null; normalArtifact = it }`
`151`	`152`	`publication.artifact(remapMojangSourcesJar) {`
`152`	`153`	`builtBy remapMojangSourcesJar`
`153`	`154`	`classifier "sources"`
	`155`	`+ sourceArtifact = it`
`154`	`156`	`}`
`155`	`157`
`156`		`- // Hack to inherit the dependencies without inheriting the artifacts`
`157`		`- publication.setArtifacts(publication.artifacts)`
`158`	`158`	`from components.java`
	`159`	`+ publication.setArtifacts([normalArtifact, sourceArtifact])`
`159`	`160`	`}`
`160`	`161`	`}`
`161`	`162`	`}`