diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts index ce2f0d8..7d31e7a 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts @@ -24,21 +24,6 @@ sourceSets { } } -xplatProject.tasks { - named("mergeJar") { - dependsOn(tasks["jar"]) - from(zipTree(tasks.getByName("jar").archiveFile.get())) - } - named("mergeJavadocJar") { - dependsOn(tasks["javadocJar"]) - from(zipTree(tasks.getByName("javadocJar").archiveFile.get())) - } - named("mergeSourcesJar") { - dependsOn(tasks["sourcesJar"]) - from(zipTree(tasks.getByName("sourcesJar").archiveFile.get())) - } -} - repositories { maven("https://maven.fabricmc.net/") { name = "Fabric" diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts index d0f1941..12c33af 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts @@ -35,6 +35,7 @@ sourceSets { } } + xplatProject.tasks { if (hasApi) { named("mergeApiJar") { @@ -43,13 +44,16 @@ xplatProject.tasks { } } named("mergeJar") { - from(project.tasks.named("jar")) + dependsOn(tasks["jar"]) + from(zipTree(tasks.getByName("jar").archiveFile.get())) } named("mergeJavadocJar") { - from(project.tasks.named("javadocJar")) + dependsOn(tasks["javadocJar"]) + from(zipTree(tasks.getByName("javadocJar").archiveFile.get())) } named("mergeSourcesJar") { - from(project.tasks.named("sourcesJar")) + dependsOn(tasks["sourcesJar"]) + from(zipTree(tasks.getByName("sourcesJar").archiveFile.get())) } }