Skip to content

Commit 16859a2

Browse files
fix: gradle shadow shenanigans (#3374)
1 parent 5bf4bea commit 16859a2

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

build-logic/src/main/kotlin/buildlogic.platform.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ val platform = extensions.create<buildlogic.PlatformExtension>("platform")
1111
platform.includeClasspath.convention(false)
1212
platform.extraAttributes.convention(mapOf())
1313

14+
shadow {
15+
addShadowVariantIntoJavaComponent = false
16+
}
17+
1418
tasks.named<ShadowJar>("shadowJar") {
1519
archiveClassifier.set("dist")
1620
relocate("com.sk89q.jchronic", "com.sk89q.worldedit.jchronic")
@@ -32,11 +36,6 @@ tasks.named<ShadowJar>("shadowJar") {
3236
exclude(dependency(stringyLibs.getLibrary("lz4Java").get()))
3337
}
3438
}
35-
val javaComponent = components["java"] as AdhocComponentWithVariants
36-
// I don't think we want this published (it's the shadow jar)
37-
javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
38-
skip()
39-
}
4039

4140
tasks.named<Jar>("jar") {
4241
val kind = platform.kind.get()

worldedit-bukkit/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,14 @@ tasks.register<ShadowJar>("reobfShadowJar") {
166166

167167
// as is done by shadow for the default shadowJar
168168
from(sourceSets.main.map { it.output })
169-
manifest.inheritFrom(tasks.jar.get().manifest)
170-
exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "module-info.class")
171-
172-
manifest {
173-
attributes(
174-
"FAWE-Plugin-Jar-Type" to "spigot"
175-
)
169+
manifest.from(tasks.jar.get().manifest) {
170+
eachEntry {
171+
if (key == "FAWE-Plugin-Jar-Type") {
172+
value = "spigot"
173+
}
174+
}
176175
}
176+
exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "module-info.class")
177177
}
178178

179179
tasks.named<ShadowJar>("shadowJar") {

0 commit comments

Comments
 (0)