diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-10-26 17:05:08 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-10-26 17:05:08 +0800 |
| commit | f8bd895afcf87805c258ee543795391b1e361054 (patch) | |
| tree | b6dd7ed71d7cac47efd4675dbea19cd2288e2798 | |
| parent | 0dd7d2b83c1b9217e7f48b4e7c07f338b00302dd (diff) | |
| parent | a8b69f3c95ebbf615c75b09871f09e976836a948 (diff) | |
| download | RoughlyEnoughItems-f8bd895afcf87805c258ee543795391b1e361054.tar.gz RoughlyEnoughItems-f8bd895afcf87805c258ee543795391b1e361054.tar.bz2 RoughlyEnoughItems-f8bd895afcf87805c258ee543795391b1e361054.zip | |
Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.515.x-1.20.5
| -rw-r--r-- | fabric/build.gradle | 7 | ||||
| -rw-r--r-- | forge/build.gradle | 7 | ||||
| -rw-r--r-- | neoforge/build.gradle | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/fabric/build.gradle b/fabric/build.gradle index 280783862..a3e258053 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 811d03a71..9879969ee 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]) } } } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index c185f5654..bb583825f 100644 --- 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]) } } } |