Fix source shading

This commit is contained in:
ah-OOG-ah committed 2025-06-25 17:30:14 -04:00
1 parent 441b41e8b9
commit 0aa57099f1
3 files changed
+17 -13

No files matched your search

@@ -6,6 +6,7 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.component.AdhocComponentWithVariants
import org.gradle.api.component.ConfigurationVariantDetails
import org.gradle.api.file.DuplicatesStrategy
import org.gradle.api.plugins.BasePluginExtension
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.SourceSetContainer
@@ -100,8 +101,7 @@ class UniMixinsPlugin : Plugin<Project> {
shadowImplementation.extendsFrom(shadowImplSources)
for (config in listOf("compileClasspath", "runtimeClasspath", "testCompileClasspath", "testRuntimeClasspath")) {
cfgs.getByName(config)
.extendsFrom(shadowImplementation)
cfgs.getByName(config).extendsFrom(shadowImplementation)
}
// Add the sources from the dual set...
@@ -112,7 +112,11 @@ class UniMixinsPlugin : Plugin<Project> {
})
// ...and copy the files into the source jar
tasks.named("sourcesJar", Jar::class.java) {
val sourcesJar = tasks.named("sourcesJar", Jar::class.java)
sourcesJar.configure {
it.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
it.dependsOn(shadowSources)
it.from(shadowSources.map { source ->
project.zipTree(source)
})
+9 -7
View File
@@ -5,14 +5,16 @@ plugins {
}
dependencies {
// TODO: make this work
shadowImplementation(project(":mixin"))
shadowImplementation(project(":compat"))
shadowImplementation(project(":mixingasm"))
shadowImplementation(project(":spongemixins"))
shadowImplementation(project(":mixinbooterlegacy"))
shadowImplementation(project(":gasstation"))
shadowImplementation(project(":gtnhmixins"))
shadowImplementation(project(":mixinextras"))
// TODO: make this suck less
shadowImplementation(project(":compat")); shadowSources(project(":compat", "sourcesElements"))
shadowImplementation(project(":mixingasm")); shadowSources(project(":mixingasm", "sourcesElements"))
shadowImplementation(project(":spongemixins")); shadowSources(project(":spongemixins", "sourcesElements"))
shadowImplementation(project(":mixinbooterlegacy")); shadowSources(project(":mixinbooterlegacy", "sourcesElements"))
shadowImplementation(project(":gasstation")); shadowSources(project(":gasstation", "sourcesElements"))
shadowImplementation(project(":gtnhmixins")); shadowSources(project(":gtnhmixins", "sourcesElements"))
shadowImplementation(project(":mixinextras")); shadowSources(project(":mixinextras", "sourcesElements"))
}
val moduleList =
+1 -3
View File
@@ -8,14 +8,12 @@ plugins {
dependencies {
compileOnly("org.spongepowered:mixin:0.8.5")
shadow(project(":common")) {
shadowImplementation(project(":common")) {
isTransitive = false
}
}
tasks.shadowJar {
configurations = listOf(project.configurations.shadow.get())
relocate("io.github.legacymoddingmc.unimixins.common", "io.github.legacymoddingmc.unimixins.compat.repackage.common")
manifest {