build: Some more gradle fixes

TwelveIterationMods · May 19, 2024 · 475b490 · 475b490
1 parent 55eb88c
commit 475b490
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -52,9 +52,9 @@ jobs:
         loader: [ common, fabric, forge, neoforge ]
         site: [ curseforge, modrinth, publish ]
         exclude:
-          - loader: shared
+          - loader: common
             site: curseforge
-          - loader: shared
+          - loader: common
             site: modrinth
     steps:
       - name: Checkout repository

diff --git a/buildSrc/src/main/groovy/multiloader-loader.gradle b/buildSrc/src/main/groovy/multiloader-loader.gradle
@@ -9,6 +9,9 @@ configurations {
     commonResources {
         canBeResolved = true
     }
+    commonGeneratedResources {
+        canBeResolved = true
+    }
 }
 
 dependencies {
@@ -19,6 +22,7 @@ dependencies {
     }
     commonJava project(path: ':common', configuration: 'commonJava')
     commonResources project(path: ':common', configuration: 'commonResources')
+    commonGeneratedResources project(path: ':common', configuration: 'commonGeneratedResources')
 }
 
 tasks.named('compileJava', JavaCompile) {
@@ -28,7 +32,9 @@ tasks.named('compileJava', JavaCompile) {
 
 processResources {
     dependsOn(configurations.commonResources)
+    dependsOn(configurations.commonGeneratedResources)
     from(configurations.commonResources)
+    from(configurations.commonGeneratedResources)
 }
 
 tasks.named('javadoc', Javadoc).configure {
@@ -41,4 +47,6 @@ tasks.named("sourcesJar", Jar) {
     from(configurations.commonJava)
     dependsOn(configurations.commonResources)
     from(configurations.commonResources)
+    dependsOn(configurations.commonGeneratedResources)
+    from(configurations.commonGeneratedResources)
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -15,6 +15,8 @@ minecraft {
     }
 }
 
+sourceSets.main.resources.srcDir('src/generated/resources')
+
 dependencies {
     compileOnly "org.spongepowered:mixin:$mixin_version"
 }

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -45,7 +45,7 @@ loom {
             runDir("build/datagen")
 
             vmArg "-Dfabric-api.datagen"
-            vmArg "-Dfabric-api.datagen.output-dir=${project(":common").file("src/main/generated")}"
+            vmArg "-Dfabric-api.datagen.output-dir=${project(":common").file("src/generated/resources")}"
             vmArg "-Dfabric-api.datagen.modid=${mod_id}"
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,8 @@ minecraft { @@
         }
     }
+    sourceSets.main.resources.srcDir('src/generated/resources')
     dependencies {
         compileOnly "org.spongepowered:mixin:$mixin_version"
     }
@@ Expand Down @@