From 1f9cbd2853d1be254af2c8d8bd6577f4fce040f7 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sun, 21 Jan 2024 10:43:22 +0100 Subject: [PATCH] Cleanup of the last PR. --- build.gradle | 10 +++++----- viafabric-mc114/build.gradle.kts | 4 ---- viafabric-mc115/build.gradle.kts | 4 ---- viafabric-mc116/build.gradle.kts | 4 ---- viafabric-mc18/build.gradle.kts | 4 ---- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index a80eb9f..8bae2a6 100644 --- a/build.gradle +++ b/build.gradle @@ -125,6 +125,10 @@ static void setupRepositories(RepositoryHandler repositories) { } } +subprojects.each { + remapJar.dependsOn("${it.path}:remapJar") +} + dependencies { // dummy version minecraft("com.mojang:minecraft:1.14.4") @@ -135,14 +139,10 @@ dependencies { include("com.github.TinfoilMC:ClientCommands:1.1.0") } -subprojects.each { - remapJar.dependsOn("${it.path}:remapJar") -} - remapJar { afterEvaluate { subprojects.each { - nestedJars.from project("${it.path}").tasks.getByName("remapJar") + nestedJars.from project("${it.path}").tasks.named("remapJar") } } } diff --git a/viafabric-mc114/build.gradle.kts b/viafabric-mc114/build.gradle.kts index 6ac4866..225be4b 100644 --- a/viafabric-mc114/build.gradle.kts +++ b/viafabric-mc114/build.gradle.kts @@ -6,7 +6,3 @@ dependencies { modImplementation("io.github.prospector:modmenu:1.7.17+build.1") modImplementation("com.github.TinfoilMC:ClientCommands:1.1.0") } - -tasks.compileJava { - options.release.set(8) -} \ No newline at end of file diff --git a/viafabric-mc115/build.gradle.kts b/viafabric-mc115/build.gradle.kts index 152a1e7..4377796 100644 --- a/viafabric-mc115/build.gradle.kts +++ b/viafabric-mc115/build.gradle.kts @@ -6,7 +6,3 @@ dependencies { modImplementation("io.github.prospector:modmenu:1.10.4+build.1") modImplementation("com.github.TinfoilMC:ClientCommands:1.1.0") } - -tasks.compileJava { - options.release.set(8) -} \ No newline at end of file diff --git a/viafabric-mc116/build.gradle.kts b/viafabric-mc116/build.gradle.kts index 6a380ea..3705ab0 100644 --- a/viafabric-mc116/build.gradle.kts +++ b/viafabric-mc116/build.gradle.kts @@ -5,7 +5,3 @@ dependencies { modImplementation("net.fabricmc.fabric-api:fabric-api:0.42.0+1.16") modImplementation("com.terraformersmc:modmenu:1.16.23") } - -tasks.compileJava { - options.release.set(8) -} \ No newline at end of file diff --git a/viafabric-mc18/build.gradle.kts b/viafabric-mc18/build.gradle.kts index 786370a..f1ccd66 100644 --- a/viafabric-mc18/build.gradle.kts +++ b/viafabric-mc18/build.gradle.kts @@ -15,7 +15,3 @@ dependencies { loom { intermediaryUrl.set("https://maven.legacyfabric.net/net/legacyfabric/intermediary/%1\$s/intermediary-%1\$s-v2.jar") } - -tasks.compileJava { - options.release.set(8) -} \ No newline at end of file