Try to fix gradle

CaffeineMC · Oct 2, 2024 · 0f9acc6 · 0f9acc6
1 parent 78a7859
commit 0f9acc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -97,18 +97,14 @@ tasks.named<net.caffeinemc.gradle.CreateMixinConfigTask>("createMixinConfig") {
     outputDirectoryForSummaryDocument = "."
     mixinParentPackages = listOf("net.caffeinemc.mods.lithium", "net.caffeinemc.mods.lithium.fabric", "net.caffeinemc.mods.lithium.neoforge")
     modShortName = "Lithium"
-}
-
-tasks.named<Jar>("jar") { // TODO decide whether jar or another task should depend on createMixinConfig
-    dependsOn("createMixinConfig")
-}
-
-//tasks.named<ProcessResources>("processResources") { // This creates a dependency cycle, no longer an option
-//    dependsOn("createMixinConfig")
-//}
 
-tasks.named<net.caffeinemc.gradle.CreateMixinConfigTask>("createMixinConfig") {
     dependsOn("compileJava")
     dependsOn(project(":fabric").tasks.named("compileJava", JavaCompile::class))
     dependsOn(project(":neoforge").tasks.named("compileJava", JavaCompile::class))
 }
+
+tasks.named<Jar>("jar") {
+    dependsOn("createMixinConfig")
+}
+
+//TODO make run client and server tasks for fabric and neoforge depend on createMixinConfig / its output files
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
     fun addCompileOnlyFabricModule(name: String) {
         val module = fabricApi.module(name, FABRIC_API_VERSION)
         modCompileOnly(module)
-        include(module)
     }
 
     addCompileOnlyFabricModule("fabric-transfer-api-v1")