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

shedaniel · Oct 26, 2024 · 7dd3627 · 7dd3627
2 parents eaf9236 + f8bd895
commit 7dd3627
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
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])
                 }
             }
         }