diff --git a/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt b/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt index d1dd6f0..97f4208 100644 --- a/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt +++ b/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt @@ -34,7 +34,7 @@ abstract class MinecraftModComponentPlugin : Plugin { attribute(MinecraftModded.MINECRAFT_MODDED_ATTRIBUTE, objectFactory.named(MinecraftModded.MODDED)) attribute(Category.CATEGORY_ATTRIBUTE, objectFactory.named(Category.LIBRARY)) attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objectFactory.named(LibraryElements.JAR)) - attribute(Bundling.BUNDLING_ATTRIBUTE, objectFactory.named(Bundling.SHADOWED)) + attribute(Bundling.BUNDLING_ATTRIBUTE, objectFactory.named(Bundling.EMBEDDED)) attribute(Usage.USAGE_ATTRIBUTE, objectFactory.named(Usage.JAVA_RUNTIME)) project.afterEvaluate { @@ -48,8 +48,8 @@ abstract class MinecraftModComponentPlugin : Plugin { attribute(MinecraftModded.MINECRAFT_MODDED_ATTRIBUTE, objectFactory.named(MinecraftModded.MODDED)) attribute(Category.CATEGORY_ATTRIBUTE, objectFactory.named(Category.LIBRARY)) attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objectFactory.named(LibraryElements.JAR)) - attribute(Bundling.BUNDLING_ATTRIBUTE, objectFactory.named(Bundling.SHADOWED)) - attribute(Usage.USAGE_ATTRIBUTE, objectFactory.named(Usage.JAVA_API)) + attribute(Bundling.BUNDLING_ATTRIBUTE, objectFactory.named(Bundling.EXTERNAL)) + attribute(Usage.USAGE_ATTRIBUTE, objectFactory.named(Usage.JAVA_RUNTIME)) project.afterEvaluate { attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, targetJvmVersion.get().toInt()) diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts b/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts index 835b4d4..bc4f3f2 100644 --- a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts +++ b/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts @@ -2,6 +2,7 @@ plugins { id("com.gradleup.shadow") java `java-library` + id("de.siphalor.tweed5.shadow.explicit") id("de.siphalor.tweed5.minecraft.mod.component") } @@ -10,16 +11,25 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } +val minecraftJijElements = configurations.resolvable("minecraftJijElements") + tasks.shadowJar { relocate("org.apache.commons", "de.siphalor.tweed5.shadowed.org.apache.commons") } +fun formatJarsForJson(jars: FileCollection): String { + return jars.files.joinToString(",") { "{\"file\":\"META-INF/jars/${it.name}\"}"} +} + tasks.register("processMinecraftModResources") { inputs.property("id", project.name) inputs.property("version", project.version) inputs.property("name", properties["module.name"]) inputs.property("description", properties["module.description"]) inputs.property("repoUrl", properties["git.url"]) + inputs.files(minecraftJijElements) + + val jars = objects.fileCollection().apply { from(minecraftJijElements) } from(project.layout.settingsDirectory.dir("../tweed5-minecraft/mod-template/resources")) { expand( @@ -29,6 +39,7 @@ tasks.register("processMinecraftModResources") { "name" to properties["module.name"], "description" to properties["module.description"], "repoUrl" to properties["git.url"], + "jars" to formatJarsForJson(jars) ) ) } @@ -44,6 +55,9 @@ tasks.register("processMinecraftTestmodResources") { inputs.property("name", properties["module.name"]) inputs.property("description", properties["module.description"]) inputs.property("repoUrl", properties["git.url"]) + inputs.files(minecraftJijElements) + + val jars = objects.fileCollection().apply { from(minecraftJijElements) } from(project.layout.settingsDirectory.dir("../tweed5-minecraft/mod-template/resources")) { expand( @@ -53,6 +67,7 @@ tasks.register("processMinecraftTestmodResources") { "name" to "${properties["module.name"]} (test mod)", "description" to properties["module.description"], "repoUrl" to properties["git.url"], + "jars" to formatJarsForJson(jars) ) ) } diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts b/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts index 73ce67e..fae8a04 100644 --- a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts +++ b/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts @@ -4,6 +4,11 @@ plugins { id("de.siphalor.tweed5.minecraft.mod.base") } +configurations.minecraftModApiElements { + extendsFrom(configurations.implementation.get()) + exclude("commons-logging", "commons-logging") +} + val minecraftModJar = tasks.register("minecraftModJar") { group = LifecycleBasePlugin.BUILD_GROUP @@ -25,13 +30,10 @@ val minecraftModSourcesJar = tasks.register("minecraftModSourcesJar") { dependsOn(tasks.named("sourcesJar")) dependsOn(tasks.named("processMinecraftModResources")) - from(tasks.named("sourcesJar").get().archiveFile.map { - if (it.asFile.exists()) { - zipTree(it) - } else { - files() - } - }) + val sourcesJar = objects.fileCollection().from(tasks.named("sourcesJar").map { it.archiveFile }) + inputs.files(sourcesJar) + + from(sourcesJar.map { zipTree(it) }) from(project.layout.buildDirectory.dir("minecraftModResources")) archiveClassifier = "sources" diff --git a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts b/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts new file mode 100644 index 0000000..a5ba92c --- /dev/null +++ b/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts @@ -0,0 +1,46 @@ +import de.siphalor.tweed5.gradle.plugin.minecraft.mod.MinecraftModded + +plugins { + java + id("de.siphalor.tweed5.publishing") + id("de.siphalor.tweed5.minecraft.mod.base") +} + +val minecraftJij = configurations.dependencyScope("minecraftJij") +val minecraftJijElements = configurations.named("minecraftJijElements") { + attributes { + attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY)) + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR)) + attribute(MinecraftModded.MINECRAFT_MODDED_ATTRIBUTE, objects.named(MinecraftModded.MODDED)) + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME)) + attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL)) + attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8) + } + extendsFrom(minecraftJij.get()) +} +configurations.runtimeElements { + extendsFrom(minecraftJijElements.get()) +} +configurations.apiElements { + extendsFrom(minecraftJijElements.get()) +} + +tasks.named("jar") { + dependsOn(tasks.named("processMinecraftModResources")) + dependsOn(minecraftJijElements) + from(project.layout.buildDirectory.dir("minecraftModResources")) + from(minecraftJijElements) { + into("META-INF/jars") + } +} + +publishing { + publications { + create("main") { + artifactId = project.name + version = project.version.toString() + + from(components["java"]) + } + } +} diff --git a/tweed5-minecraft/buildSrc/src/main/kotlin/de/siphalor/tweed5/minecraft/bundled/sources/BundledSourcesJar.kt b/tweed5-minecraft/buildSrc/src/main/kotlin/de/siphalor/tweed5/minecraft/bundled/sources/BundledSourcesJar.kt index 6fa83e9..8eede12 100644 --- a/tweed5-minecraft/buildSrc/src/main/kotlin/de/siphalor/tweed5/minecraft/bundled/sources/BundledSourcesJar.kt +++ b/tweed5-minecraft/buildSrc/src/main/kotlin/de/siphalor/tweed5/minecraft/bundled/sources/BundledSourcesJar.kt @@ -2,6 +2,7 @@ package de.siphalor.tweed5.minecraft.bundled.sources import org.gradle.api.file.ArchiveOperations import org.gradle.api.file.ConfigurableFileCollection +import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.tasks.InputFiles import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.bundling.Jar @@ -17,5 +18,7 @@ abstract class BundledSourcesJar: Jar() { @TaskAction override fun copy() { from(sources.filter { it.name.startsWith("tweed5") }.map { archiveOperations.zipTree(it) }) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + super.copy() } } diff --git a/tweed5-minecraft/bundle-pojo-weaving/build.gradle.kts b/tweed5-minecraft/bundle-pojo-weaving/build.gradle.kts new file mode 100644 index 0000000..7e76e33 --- /dev/null +++ b/tweed5-minecraft/bundle-pojo-weaving/build.gradle.kts @@ -0,0 +1,32 @@ +import de.siphalor.tweed5.minecraft.bundled.sources.BundledSourcesJar + +plugins { + id("de.siphalor.tweed5.minecraft.mod.bundle") +} + +configurations.minecraftJijElements { + isTransitive = false +} +val bundledSourcesConfiguration = configurations.resolvable("bundledSources") { + extendsFrom(configurations.minecraftJijElements.get()) + isTransitive = false + attributes { + attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType.SOURCES)) + } +} + +dependencies { + minecraftJij("de.siphalor.tweed5:tweed5-annotation-inheritance") + minecraftJij("de.siphalor.tweed5:tweed5-naming-format") + minecraftJij("de.siphalor.tweed5:tweed5-type-utils") + minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo") + minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-attributes-extension") + minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-presets-extension") + minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-serde-extension") + minecraftJij("de.siphalor.tweed5:tweed5-weaver-pojo-validation-extension") +} + +tasks.register("sourcesJar") { + sources.from(bundledSourcesConfiguration) + archiveClassifier.set("sources") +} diff --git a/tweed5-minecraft/bundle-pojo-weaving/gradle.properties b/tweed5-minecraft/bundle-pojo-weaving/gradle.properties new file mode 100644 index 0000000..c5d992a --- /dev/null +++ b/tweed5-minecraft/bundle-pojo-weaving/gradle.properties @@ -0,0 +1,3 @@ +module.name = Tweed 5 Bundle +module.description = Bundle of pre-packaged Tweed modules \ + that are usually required for your Minecraft mod config needs. diff --git a/tweed5-minecraft/bundle/build.gradle.kts b/tweed5-minecraft/bundle/build.gradle.kts index b9bb099..dfc5875 100644 --- a/tweed5-minecraft/bundle/build.gradle.kts +++ b/tweed5-minecraft/bundle/build.gradle.kts @@ -1,7 +1,7 @@ import de.siphalor.tweed5.minecraft.bundled.sources.BundledSourcesJar plugins { - id("de.siphalor.tweed5.minecraft.mod.dummy") + id("de.siphalor.tweed5.minecraft.mod.bundle") } val bundledSourcesConfiguration = configurations.resolvable("bundledSources") { @@ -12,51 +12,12 @@ val bundledSourcesConfiguration = configurations.resolvable("bundledSources") { } } -configurations.implementation { - exclude(group = "commons-logging", module = "commons-logging") -} - -val vendoredCommonsLogging = project.layout.settingsDirectory.file("vendor/commons-logging").asFile - dependencies { - implementation("de.siphalor.tweed5:tweed5-core") - implementation("de.siphalor.tweed5:tweed5-attributes-extension") - implementation("de.siphalor.tweed5:tweed5-default-extensions") - implementation("de.siphalor.tweed5:tweed5-serde-extension") - implementation("de.siphalor.tweed5:tweed5-weaver-pojo") - implementation("de.siphalor.tweed5:tweed5-weaver-pojo-attributes-extension") - implementation("de.siphalor.tweed5:tweed5-weaver-pojo-presets-extension") - implementation("de.siphalor.tweed5:tweed5-weaver-pojo-serde-extension") - implementation("de.siphalor.tweed5:tweed5-weaver-pojo-validation-extension") - - implementation( - objects.fileCollection().apply { - from( - vendoredCommonsLogging.resolve("target") - .listFiles { it.name.endsWith("SNAPSHOT.jar") } - ) - builtBy("compileCommonsLogging") - } - ) -} - -tasks.register("compileCommonsLogging") { - inputs.file(vendoredCommonsLogging.resolve("pom.xml")) - inputs.dir(vendoredCommonsLogging.resolve("src")) - outputs.dir(vendoredCommonsLogging.resolve("target")) - commandLine("mvn", "package", "-DskipTests") - workingDir(vendoredCommonsLogging) -} - -tasks.shadowJar { - relocate("org.objectweb.asm", "de.siphalor.tweed5.shadowed.org.objectweb.asm") - - relocate("META-INF", "META-INF/tweed5-vendored/commons-logging") { - include("META-INF/*.txt") - } - exclude("META-INF/maven/**") - // Remove some obsolete classes - exclude("org/apache/commons/logging/impl/WeakHashtable*") + minecraftJij("de.siphalor.tweed5:tweed5-core") + minecraftJij("de.siphalor.tweed5:tweed5-attributes-extension") + minecraftJij("de.siphalor.tweed5:tweed5-default-extensions") + minecraftJij("de.siphalor.tweed5:tweed5-serde-extension") + minecraftJij(project(":tweed5-logging")) } tasks.register("sourcesJar") { diff --git a/tweed5-minecraft/coat-bridge/build.gradle.kts b/tweed5-minecraft/coat-bridge/build.gradle.kts index 64684c5..9de3bc6 100644 --- a/tweed5-minecraft/coat-bridge/build.gradle.kts +++ b/tweed5-minecraft/coat-bridge/build.gradle.kts @@ -13,7 +13,9 @@ dependencies { listOf("fabric-key-binding-api-v1", "fabric-resource-loader-v0").forEach { modTestmodImplementation(fabricApi.module(it, mcLibs.versions.fabric.api.get())) } - testmodImplementation(project(":tweed5-bundle", configuration = "minecraftModElements")) + testmodImplementation(project(":tweed5-logging", configuration = "minecraftModApiElements")) + testmodImplementation(project(":tweed5-bundle", configuration = "runtimeElements")) + testmodImplementation(project(":tweed5-bundle-pojo-weaving", configuration = "runtimeElements")) testmodImplementation(project(":tweed5-fabric-helper", configuration = "namedElements")) modTestmodImplementation(mcLibs.coat) modTestmodImplementation(mcLibs.amecs.api) diff --git a/tweed5-minecraft/fabric-helper/build.gradle.kts b/tweed5-minecraft/fabric-helper/build.gradle.kts index fa1d01a..7d8ba7f 100644 --- a/tweed5-minecraft/fabric-helper/build.gradle.kts +++ b/tweed5-minecraft/fabric-helper/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { listOf("fabric-networking-api-v1", "fabric-lifecycle-events-v1").forEach { modTestmodImplementation(fabricApi.module(it, mcLibs.versions.fabric.api.get())) } - testmodImplementation(project(":tweed5-bundle", configuration = "minecraftModElements")) + testmodImplementation(project(":tweed5-bundle")) testmodImplementation("de.siphalor.tweed5:tweed5-comment-loader-extension") testmodImplementation("de.siphalor.tweed5:tweed5-serde-hjson") testmodImplementation("de.siphalor.tweed5:tweed5-serde-gson") diff --git a/tweed5-minecraft/logging/build.gradle.kts b/tweed5-minecraft/logging/build.gradle.kts new file mode 100644 index 0000000..55fa0de --- /dev/null +++ b/tweed5-minecraft/logging/build.gradle.kts @@ -0,0 +1,32 @@ +plugins { + id("de.siphalor.tweed5.minecraft.mod.dummy") +} + +val vendoredCommonsLogging = project.layout.settingsDirectory.file("vendor/commons-logging").asFile + +dependencies { + shadowOnly(objects.fileCollection().apply { + from( + vendoredCommonsLogging.resolve("target") + .listFiles { it.name.endsWith("SNAPSHOT.jar") } + ) + builtBy("compileCommonsLogging") + }) +} + +tasks.register("compileCommonsLogging") { + inputs.file(vendoredCommonsLogging.resolve("pom.xml")) + inputs.dir(vendoredCommonsLogging.resolve("src")) + outputs.dir(vendoredCommonsLogging.resolve("target")) + commandLine("mvn", "package", "-DskipTests") + workingDir(vendoredCommonsLogging) +} + +tasks.shadowJar { + relocate("META-INF", "META-INF/tweed5-vendored/commons-logging") { + include("META-INF/*.txt") + } + exclude("META-INF/maven/**") + // Remove some obsolete classes + exclude("org/apache/commons/logging/impl/WeakHashtable*") +} diff --git a/tweed5-minecraft/logging/gradle.properties b/tweed5-minecraft/logging/gradle.properties new file mode 100644 index 0000000..5d105ea --- /dev/null +++ b/tweed5-minecraft/logging/gradle.properties @@ -0,0 +1,4 @@ +module.name = Tweed 5 Logging +module.description = Fork and relocation of Apache Commons Logging.\n\ + Contains a small fix to support older Log4j versions. \ + Also removes some obsolete classes. diff --git a/tweed5-minecraft/mod-template/resources/fabric.mod.json b/tweed5-minecraft/mod-template/resources/fabric.mod.json index b4bcbbc..41ab1d3 100644 --- a/tweed5-minecraft/mod-template/resources/fabric.mod.json +++ b/tweed5-minecraft/mod-template/resources/fabric.mod.json @@ -33,5 +33,6 @@ "authors": [ "Siphalor" ], - "version": "${version}" + "version": "${version}", + "jars": [${jars}] } diff --git a/tweed5-minecraft/settings.gradle.kts b/tweed5-minecraft/settings.gradle.kts index 0cb65ec..b22026b 100644 --- a/tweed5-minecraft/settings.gradle.kts +++ b/tweed5-minecraft/settings.gradle.kts @@ -52,8 +52,10 @@ dependencyResolutionManagement { includeBuild("../tweed5") includeNormalModule("bundle") +includeNormalModule("bundle-pojo-weaving") includeNormalModule("coat-bridge") includeNormalModule("fabric-helper") +includeNormalModule("logging") fun includeNormalModule(name: String) { includeAs("tweed5-$name", name) diff --git a/tweed5/annotation-inheritance/build.gradle.kts b/tweed5/annotation-inheritance/build.gradle.kts index f353d8c..278d730 100644 --- a/tweed5/annotation-inheritance/build.gradle.kts +++ b/tweed5/annotation-inheritance/build.gradle.kts @@ -1,9 +1,19 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") +} + +configurations.minecraftModApiElements { + exclude("org.ow2.asm", "asm") } dependencies { implementation(project(":tweed5-utils")) implementation(project(":tweed5-type-utils")) implementation(libs.asm.core) + shadowOnly(libs.asm.core) +} + +tasks.shadowJar { + relocate("org.objectweb.asm", "de.siphalor.tweed5.annotationinheritance.shadowed.org.objectweb.asm") } diff --git a/tweed5/attributes-extension/build.gradle.kts b/tweed5/attributes-extension/build.gradle.kts index 4659332..3e52514 100644 --- a/tweed5/attributes-extension/build.gradle.kts +++ b/tweed5/attributes-extension/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies { diff --git a/tweed5/comment-loader-extension/build.gradle.kts b/tweed5/comment-loader-extension/build.gradle.kts index c273e08..b76e19b 100644 --- a/tweed5/comment-loader-extension/build.gradle.kts +++ b/tweed5/comment-loader-extension/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") id("de.siphalor.tweed5.minecraft.mod.dummy") - id("de.siphalor.tweed5.shadow.explicit") } dependencies { diff --git a/tweed5/construct/build.gradle.kts b/tweed5/construct/build.gradle.kts index 4943a3b..c1bf9fe 100644 --- a/tweed5/construct/build.gradle.kts +++ b/tweed5/construct/build.gradle.kts @@ -1,3 +1,4 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } diff --git a/tweed5/core/build.gradle.kts b/tweed5/core/build.gradle.kts index e336e05..71e3d60 100644 --- a/tweed5/core/build.gradle.kts +++ b/tweed5/core/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies { diff --git a/tweed5/default-extensions/build.gradle.kts b/tweed5/default-extensions/build.gradle.kts index f50b8f4..e0bef75 100644 --- a/tweed5/default-extensions/build.gradle.kts +++ b/tweed5/default-extensions/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies { diff --git a/tweed5/naming-format/build.gradle.kts b/tweed5/naming-format/build.gradle.kts index 5bc3d71..ec0993e 100644 --- a/tweed5/naming-format/build.gradle.kts +++ b/tweed5/naming-format/build.gradle.kts @@ -1,3 +1,4 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } diff --git a/tweed5/patchwork/build.gradle.kts b/tweed5/patchwork/build.gradle.kts index 5bc3d71..ec0993e 100644 --- a/tweed5/patchwork/build.gradle.kts +++ b/tweed5/patchwork/build.gradle.kts @@ -1,3 +1,4 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } diff --git a/tweed5/serde-api/build.gradle.kts b/tweed5/serde-api/build.gradle.kts index 5bc3d71..ec0993e 100644 --- a/tweed5/serde-api/build.gradle.kts +++ b/tweed5/serde-api/build.gradle.kts @@ -1,3 +1,4 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } diff --git a/tweed5/serde-extension/build.gradle.kts b/tweed5/serde-extension/build.gradle.kts index c55ef27..54018be 100644 --- a/tweed5/serde-extension/build.gradle.kts +++ b/tweed5/serde-extension/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies { diff --git a/tweed5/serde-gson/build.gradle.kts b/tweed5/serde-gson/build.gradle.kts index bb01326..c948166 100644 --- a/tweed5/serde-gson/build.gradle.kts +++ b/tweed5/serde-gson/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") id("de.siphalor.tweed5.minecraft.mod.dummy") - id("de.siphalor.tweed5.shadow.explicit") } dependencies { diff --git a/tweed5/serde-hjson/build.gradle.kts b/tweed5/serde-hjson/build.gradle.kts index 2005fc0..abf7088 100644 --- a/tweed5/serde-hjson/build.gradle.kts +++ b/tweed5/serde-hjson/build.gradle.kts @@ -8,7 +8,3 @@ dependencies { testImplementation(project(":serde-json-test-utils")) } - -tasks.shadowJar { - configurations = setOf() -} diff --git a/tweed5/serde-jackson/build.gradle.kts b/tweed5/serde-jackson/build.gradle.kts index eb352c6..e7fab7f 100644 --- a/tweed5/serde-jackson/build.gradle.kts +++ b/tweed5/serde-jackson/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") id("de.siphalor.tweed5.minecraft.mod.dummy") - id("de.siphalor.tweed5.shadow.explicit") } dependencies { diff --git a/tweed5/type-utils/build.gradle.kts b/tweed5/type-utils/build.gradle.kts index 5bc3d71..ec0993e 100644 --- a/tweed5/type-utils/build.gradle.kts +++ b/tweed5/type-utils/build.gradle.kts @@ -1,3 +1,4 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } diff --git a/tweed5/utils/build.gradle.kts b/tweed5/utils/build.gradle.kts index 5bc3d71..ec0993e 100644 --- a/tweed5/utils/build.gradle.kts +++ b/tweed5/utils/build.gradle.kts @@ -1,3 +1,4 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } diff --git a/tweed5/weaver-pojo-attributes-extension/build.gradle.kts b/tweed5/weaver-pojo-attributes-extension/build.gradle.kts index 84863da..cf3e32c 100644 --- a/tweed5/weaver-pojo-attributes-extension/build.gradle.kts +++ b/tweed5/weaver-pojo-attributes-extension/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies { diff --git a/tweed5/weaver-pojo-presets-extension/build.gradle.kts b/tweed5/weaver-pojo-presets-extension/build.gradle.kts index c13cb2c..520b309 100644 --- a/tweed5/weaver-pojo-presets-extension/build.gradle.kts +++ b/tweed5/weaver-pojo-presets-extension/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies { diff --git a/tweed5/weaver-pojo-serde-extension/build.gradle.kts b/tweed5/weaver-pojo-serde-extension/build.gradle.kts index 629f863..0b0ba0f 100644 --- a/tweed5/weaver-pojo-serde-extension/build.gradle.kts +++ b/tweed5/weaver-pojo-serde-extension/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies { diff --git a/tweed5/weaver-pojo-validation-extension/build.gradle.kts b/tweed5/weaver-pojo-validation-extension/build.gradle.kts index c13cb2c..520b309 100644 --- a/tweed5/weaver-pojo-validation-extension/build.gradle.kts +++ b/tweed5/weaver-pojo-validation-extension/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies { diff --git a/tweed5/weaver-pojo/build.gradle.kts b/tweed5/weaver-pojo/build.gradle.kts index 3e9cc1d..d76414b 100644 --- a/tweed5/weaver-pojo/build.gradle.kts +++ b/tweed5/weaver-pojo/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("de.siphalor.tweed5.base-module") + id("de.siphalor.tweed5.minecraft.mod.dummy") } dependencies {