Skip to content

Commit e75647a

Browse files
gniftygnomegniftygnome
committed
On to the next problem, hopefully.
1 parent c9871c7 commit e75647a

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎fabric/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ publish {
4949
rootProject.enabled_platforms.split(",").contains(project.projectDir)
5050
}
5151
onlyIf {
52-
checkVersion(project.base.archivesName, version)
52+
checkVersion(project.base.archivesName.get(), version)
5353
}
5454

5555
curseforge_game_versions = "${rootProject.curseforge_game_versions}, Fabric, Quilt"
@@ -59,23 +59,23 @@ publish {
5959
publishing {
6060
publications {
6161
mavenJava(MavenPublication) {
62-
// Gradle's config cache forces stupid hacks
63-
Provider<String> groupIdProvider = project.provider { rootProject.maven_group.toString() }
64-
Provider<String> artifactIdProvider = project.provider { project.base.archivesName.toString() }
65-
Provider<String> versionProvider = project.provider { project.version.toString() }
66-
6762
from components.java
68-
groupId = groupIdProvider.get()
69-
artifactId = artifactIdProvider.get()
70-
version = versionProvider.get()
63+
groupId = "${rootProject.maven_group}"
64+
artifactId = "${project.base.archivesName.get()}"
65+
version = "${rootProject.version}"
7166

72-
// Exclude TerraBlender from maven deps so Loom does not load it during builds
73-
// and tests of other projects using our API (unless they configure it to).
7467
pom.withXml {
7568
asNode().dependencies.dependency.each { dep ->
69+
// Exclude TerraBlender from maven deps so Loom does not load it during builds
70+
// and tests of other projects using our API (unless they configure it to).
7671
if (dep.artifactId.last().value().last() in ["TerraBlender-fabric", "TerraBlender-forge", "TerraBlender-neoforge"]) {
7772
assert dep.parent().remove(dep)
7873
}
74+
75+
// Exclude merged common project from maven deps to prevent Loom doing anything stupid.
76+
if (dep.artifactId.last().value().last() in ["common"]) {
77+
assert dep.parent().remove(dep)
78+
}
7979
}
8080
}
8181
}

‎forge/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ publish {
4242
rootProject.enabled_platforms.split(",").contains(project.projectDir)
4343
}
4444
onlyIf {
45-
checkVersion(project.base.archivesName, version)
45+
checkVersion(project.base.archivesName.get(), version)
4646
}
4747

4848
curseforge_game_versions = "${rootProject.curseforge_game_versions}, Forge"
@@ -52,23 +52,23 @@ publish {
5252
publishing {
5353
publications {
5454
mavenJava(MavenPublication) {
55-
// Gradle's config cache forces stupid hacks
56-
Provider<String> groupIdProvider = project.provider { rootProject.maven_group.toString() }
57-
Provider<String> artifactIdProvider = project.provider { project.base.archivesName.toString() }
58-
Provider<String> versionProvider = project.provider { project.version.toString() }
59-
6055
from components.java
61-
groupId = groupIdProvider.get()
62-
artifactId = artifactIdProvider.get()
63-
version = versionProvider.get()
56+
groupId = "${rootProject.maven_group}"
57+
artifactId = "${project.base.archivesName.get()}"
58+
version = "${rootProject.version}"
6459

65-
// Exclude TerraBlender from maven deps so Loom does not load it during builds
66-
// and tests of other projects using our API (unless they configure it to).
6760
pom.withXml {
6861
asNode().dependencies.dependency.each { dep ->
62+
// Exclude TerraBlender from maven deps so Loom does not load it during builds
63+
// and tests of other projects using our API (unless they configure it to).
6964
if (dep.artifactId.last().value().last() in ["TerraBlender-fabric", "TerraBlender-forge", "TerraBlender-neoforge"]) {
7065
assert dep.parent().remove(dep)
7166
}
67+
68+
// Exclude merged common project from maven deps to prevent Loom doing anything stupid.
69+
if (dep.artifactId.last().value().last() in ["common"]) {
70+
assert dep.parent().remove(dep)
71+
}
7272
}
7373
}
7474
}

‎neoforge/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ publish {
4949
rootProject.enabled_platforms.split(",").contains(project.projectDir)
5050
}
5151
onlyIf {
52-
checkVersion(project.base.archivesName, version)
52+
checkVersion(project.base.archivesName.get(), version)
5353
}
5454

5555
curseforge_game_versions = "${rootProject.curseforge_game_versions}, NeoForge"
@@ -59,23 +59,23 @@ publish {
5959
publishing {
6060
publications {
6161
mavenJava(MavenPublication) {
62-
// Gradle's config cache forces stupid hacks
63-
Provider<String> groupIdProvider = project.provider { rootProject.maven_group.toString() }
64-
Provider<String> artifactIdProvider = project.provider { project.base.archivesName.toString() }
65-
Provider<String> versionProvider = project.provider { project.version.toString() }
66-
6762
from components.java
68-
groupId = groupIdProvider.get()
69-
artifactId = artifactIdProvider.get()
70-
version = versionProvider.get()
63+
groupId = "${rootProject.maven_group}"
64+
artifactId = "${project.base.archivesName.get()}"
65+
version = "${rootProject.version}"
7166

72-
// Exclude TerraBlender from maven deps so Loom does not load it during builds
73-
// and tests of other projects using our API (unless they configure it to).
7467
pom.withXml {
7568
asNode().dependencies.dependency.each { dep ->
69+
// Exclude TerraBlender from maven deps so Loom does not load it during builds
70+
// and tests of other projects using our API (unless they configure it to).
7671
if (dep.artifactId.last().value().last() in ["TerraBlender-fabric", "TerraBlender-forge", "TerraBlender-neoforge"]) {
7772
assert dep.parent().remove(dep)
7873
}
74+
75+
// Exclude merged common project from maven deps to prevent Loom doing anything stupid.
76+
if (dep.artifactId.last().value().last() in ["common"]) {
77+
assert dep.parent().remove(dep)
78+
}
7979
}
8080
}
8181
}

0 commit comments

Comments
 (0)