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 deleted file mode 100644 index 8eede12..0000000 --- a/tweed5-minecraft/buildSrc/src/main/kotlin/de/siphalor/tweed5/minecraft/bundled/sources/BundledSourcesJar.kt +++ /dev/null @@ -1,24 +0,0 @@ -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 -import javax.inject.Inject - -abstract class BundledSourcesJar: Jar() { - @get:InputFiles - abstract val sources: ConfigurableFileCollection - - @get:Inject - abstract val archiveOperations: ArchiveOperations - - @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 index 7e76e33..16f2eb2 100644 --- a/tweed5-minecraft/bundle-pojo-weaving/build.gradle.kts +++ b/tweed5-minecraft/bundle-pojo-weaving/build.gradle.kts @@ -1,5 +1,3 @@ -import de.siphalor.tweed5.minecraft.bundled.sources.BundledSourcesJar - plugins { id("de.siphalor.tweed5.minecraft.mod.bundle") } @@ -7,13 +5,6 @@ plugins { 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") @@ -25,8 +16,3 @@ dependencies { 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/build.gradle.kts b/tweed5-minecraft/bundle/build.gradle.kts index dfc5875..ac12ab5 100644 --- a/tweed5-minecraft/bundle/build.gradle.kts +++ b/tweed5-minecraft/bundle/build.gradle.kts @@ -1,17 +1,7 @@ -import de.siphalor.tweed5.minecraft.bundled.sources.BundledSourcesJar - plugins { id("de.siphalor.tweed5.minecraft.mod.bundle") } -val bundledSourcesConfiguration = configurations.resolvable("bundledSources") { - extendsFrom(configurations.implementation.get()) - isTransitive = true - attributes { - attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType.SOURCES)) - } -} - dependencies { minecraftJij("de.siphalor.tweed5:tweed5-core") minecraftJij("de.siphalor.tweed5:tweed5-attributes-extension") @@ -19,8 +9,3 @@ dependencies { minecraftJij("de.siphalor.tweed5:tweed5-serde-extension") minecraftJij(project(":tweed5-logging")) } - -tasks.register("sourcesJar") { - sources.from(bundledSourcesConfiguration) - archiveClassifier.set("sources") -}