Skip to content

Commit b02d45b

Browse files
committed
Switch back to standard artifacts
Hooray! Fixed this awful hack
1 parent 5faf62b commit b02d45b

File tree

10 files changed

+18
-98
lines changed

10 files changed

+18
-98
lines changed

all/build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ plugins {
55
}
66

77
dependencies {
8-
implementation(project(":mixin", "shadowArtifact"))
9-
implementation(project(":compat", "shadowArtifact"))
10-
implementation(project(":mixingasm", "shadowArtifact"))
11-
implementation(project(":spongemixins", "shadowArtifact"))
12-
implementation(project(":mixinbooterlegacy", "shadowArtifact"))
13-
implementation(project(":gasstation", "shadowArtifact"))
14-
implementation(project(":gtnhmixins", "shadowArtifact"))
15-
implementation(project(":mixinextras", "shadowArtifact"))
8+
implementation(project(":mixin"))
9+
implementation(project(":compat"))
10+
implementation(project(":mixingasm"))
11+
implementation(project(":spongemixins"))
12+
implementation(project(":mixinbooterlegacy"))
13+
implementation(project(":gasstation"))
14+
implementation(project(":gtnhmixins"))
15+
implementation(project(":mixinextras"))
1616
}
1717

1818
val moduleList =

common/build.gradle.kts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@ plugins {
22
id("unimixins")
33
}
44

5-
val shadowArtifact: Configuration by configurations.creating
6-
shadowArtifact.isCanBeConsumed = true
7-
8-
artifacts {
9-
add("shadowArtifact", tasks["shadowJar"]) {
10-
builtBy(tasks["shadowJar"])
11-
}
12-
}
13-
145
unimined.minecraft {
156

167
}

compat/build.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
dependencies {
1010
compileOnly("org.spongepowered:mixin:0.8.5")
11-
shadow(project(":common", "shadowArtifact")) {
11+
shadow(project(":common")) {
1212
isTransitive = false
1313
}
1414
}
@@ -27,15 +27,6 @@ tasks.shadowJar {
2727
}
2828
}
2929

30-
val shadowArtifact: Configuration by configurations.creating
31-
shadowArtifact.isCanBeConsumed = true
32-
33-
artifacts {
34-
add("shadowArtifact", tasks["shadowJar"]) {
35-
builtBy(tasks["shadowJar"])
36-
}
37-
}
38-
3930
unimined.minecraft {
4031

4132
}

gasstation/build.gradle.kts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ repositories {
2020

2121
dependencies {
2222
compileOnly("org.spongepowered:mixin:$gasMixVersion")
23-
compileOnly(project(":mixinbooterlegacy", "shadowArtifact"))
24-
shadow(project(":common", "shadowArtifact")) {
23+
compileOnly(project(":mixinbooterlegacy"))
24+
shadow(project(":common")) {
2525
isTransitive = false
2626
}
2727
}
@@ -40,15 +40,6 @@ tasks.shadowJar {
4040
}
4141
}
4242

43-
val shadowArtifact: Configuration by configurations.creating
44-
shadowArtifact.isCanBeConsumed = true
45-
46-
artifacts {
47-
add("shadowArtifact", tasks["shadowJar"]) {
48-
builtBy(tasks["shadowJar"])
49-
}
50-
}
51-
5243
tasks.processResources {
5344
files("mcmod.info") {
5445
filter<ReplaceTokens>("tokens" to mapOf(

gtnhmixins/build.gradle.kts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ repositories {
2323

2424
dependencies {
2525
compileOnly("org.spongepowered:mixin:0.8.7")
26-
shadow(project(":common", "shadowArtifact")) {
26+
shadow(project(":common")) {
2727
isTransitive = false
2828
}
29-
compileOnly(project(":mixingasm", "shadowArtifact")) {
29+
compileOnly(project(":mixingasm")) {
3030
isTransitive = false
3131
}
3232
compileOnly("com.github.LlamaLad7:MixinExtras:$mixinExtrasVersion")
@@ -72,15 +72,6 @@ tasks.shadowJar {
7272
dependsOn(mixinExtrasJar)
7373
}
7474

75-
val shadowArtifact: Configuration by configurations.creating
76-
shadowArtifact.isCanBeConsumed = true
77-
78-
artifacts {
79-
add("shadowArtifact", tasks["shadowJar"]) {
80-
builtBy(tasks["shadowJar"])
81-
}
82-
}
83-
8475
tasks.processResources {
8576
files("mcmod.info") {
8677
filter<ReplaceTokens>("tokens" to mapOf(

mixin/build.gradle.kts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ val mixinFlavorClassifier = "unimix.${mixinVersion.replace('+', '-')}"
3333

3434
dependencies {
3535
compileOnly("org.spongepowered:mixin:$spongepoweredMixinVersion")
36-
compileOnly(project(":common", "shadowArtifact")) {
36+
compileOnly(project(":common")) {
3737
isTransitive = false
3838
}
3939

40-
shadowUniMix(project(":common", "shadowArtifact")) {
40+
shadowUniMix(project(":common")) {
4141
isTransitive = false
4242
}
4343
shadowUniMix(mixinDep) {
@@ -198,12 +198,3 @@ tasks["jar"].dependsOn(shadowSourcesJarTask)
198198
unimined.minecraft {
199199

200200
}
201-
202-
val shadowArtifact: Configuration by configurations.creating
203-
shadowArtifact.isCanBeConsumed = true
204-
205-
artifacts {
206-
add("shadowArtifact", tasks["shadowJar"]) {
207-
builtBy(tasks["shadowJar"])
208-
}
209-
}

mixinbooterlegacy/build.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020

2121
dependencies {
2222
compileOnly("org.spongepowered:mixin:0.8.5-gasstation_7")
23-
shadow(project(":common", "shadowArtifact")) {
23+
shadow(project(":common")) {
2424
isTransitive = false
2525
}
2626
}
@@ -53,12 +53,3 @@ tasks.processResources {
5353
unimined.minecraft {
5454

5555
}
56-
57-
val shadowArtifact: Configuration by configurations.creating
58-
shadowArtifact.isCanBeConsumed = true
59-
60-
artifacts {
61-
add("shadowArtifact", tasks["shadowJar"]) {
62-
builtBy(tasks["shadowJar"])
63-
}
64-
}

mixinextras/build.gradle.kts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,6 @@ tasks.processResources {
5151
}
5252
}
5353

54-
val shadowArtifact: Configuration by configurations.creating
55-
shadowArtifact.isCanBeConsumed = true
56-
57-
artifacts {
58-
add("shadowArtifact", tasks["shadowJar"]) {
59-
builtBy(tasks["shadowJar"])
60-
}
61-
}
62-
6354
unimined.minecraft {
6455

6556
}

mixingasm/build.gradle.kts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ val mixingasmVersion = "0.3"
88
version = "$version+$mixingasmVersion"
99

1010
dependencies {
11-
implementation(project(":mixin", "shadowArtifact"))
12-
shadow(project(":common", "shadowArtifact")) {
11+
implementation(project(":mixin"))
12+
shadow(project(":common")) {
1313
isTransitive = false
1414
}
1515
}
@@ -38,14 +38,6 @@ tasks.processResources {
3838
}
3939
}
4040

41-
val shadowArtifact by configurations.creating
42-
shadowArtifact.isCanBeConsumed = true
43-
artifacts {
44-
add("shadowArtifact", tasks["shadowJar"]) {
45-
builtBy(tasks["shadowJar"])
46-
}
47-
}
48-
4941
unimined.minecraft {
5042

5143
}

spongemixins/build.gradle.kts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,6 @@ tasks.processResources {
3131
}
3232
}
3333

34-
val shadowArtifact: Configuration by configurations.creating
35-
shadowArtifact.isCanBeConsumed = true
36-
37-
artifacts {
38-
add("shadowArtifact", tasks["shadowJar"]) {
39-
builtBy(tasks["shadowJar"])
40-
}
41-
}
42-
4334
unimined.minecraft {
4435

4536
}

0 commit comments

Comments
 (0)