Merge remote-tracking branch 'origin/9.x-1.19' into 12.x-1.2012.x-1.20

1 files changed, 4 insertions, 3 deletions

diff --git a/forge/build.gradle b/forge/build.gradle
index fae774db0..d91fbff66 100644
--- 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])
                 }
             }
         }