diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-10-26 17:03:13 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-10-26 17:03:13 +0800 |
| commit | d0acdeaf8e855627086ed1257c6c98a0dfd7f670 (patch) | |
| tree | 893d47c4af0cf8fad6a9a32633f43e82b64d1043 | |
| parent | 91cc0c43de61b97b54477f90710a45bc71b744b9 (diff) | |
| parent | 659f87a0a131f080acc94a106b8f7d81a056982b (diff) | |
| download | RoughlyEnoughItems-d0acdeaf8e855627086ed1257c6c98a0dfd7f670.tar.gz RoughlyEnoughItems-d0acdeaf8e855627086ed1257c6c98a0dfd7f670.tar.bz2 RoughlyEnoughItems-d0acdeaf8e855627086ed1257c6c98a0dfd7f670.zip | |
Merge remote-tracking branch 'origin/9.x-1.19' into 12.x-1.2012.x-1.20
| -rw-r--r-- | fabric/build.gradle | 7 | ||||
| -rw-r--r-- | forge/build.gradle | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/fabric/build.gradle b/fabric/build.gradle index a979d9829..bc4014085 100644 --- 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 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]) } } } |