chore: upgrade refined architect

To fix issues with NeoForge asset
updating.

With this change, every api module is now
compiled with the mod instead of using
the fabric jar-in-jar system.
The reason for this is for consistency
with neoforge, which always had the apis
compiled along with the main mod.

The only reason why we used jij on fabric
was for legacy reasons
 (RS 2 was originally made on fabric)
 and for inclusion
of the apis in modmenu.
But this is not important.

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
     types: [ opened, synchronize, reopened ]
 jobs:
   build:
-    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.18.0
     with:
       gametests: true
     secrets: inherit

.github/workflows/draft-release.yml

@@ -17,7 +17,7 @@ on:
         type: string
 jobs:
   draft:
-    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.18.0
     with:
       release-type: ${{ inputs.release-type }}
       version-number-override: ${{ inputs.version-number-override }}

.github/workflows/issue-for-unsupported-version.yml

@@ -4,4 +4,4 @@ on:
     types: [ labeled, unlabeled, reopened ]
 jobs:
   unsupported-labeler:
-    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.18.0

.github/workflows/publish-release.yml

@@ -7,7 +7,7 @@ on:
       - closed
 jobs:
   publish-release:
-    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.18.0
     secrets: inherit
     with:
       project-name: 'Refined Storage'

.github/workflows/resolved-issue-locking.yml

@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * 1'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.18.0

.github/workflows/validate-branch-name.yml

@@ -2,4 +2,4 @@ name: Validate branch name
 on: [ pull_request ]
 jobs:
   validate-branch-name:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.18.0

.github/workflows/validate-changelog.yml

@@ -4,4 +4,4 @@ on:
     types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
 jobs:
   validate-changelog:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.18.0

.github/workflows/validate-commit-messages.yml

@@ -2,4 +2,4 @@ name: Validate commit messages
 on: [ pull_request ]
 jobs:
   validate-commit-messages:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.18.0

gradle.properties

@@ -1,3 +1,3 @@
-refinedarchitectVersion=0.17.1
+refinedarchitectVersion=0.18.0
 # Gradle
 org.gradle.jvmargs=-Xmx1G

refinedstorage-fabric/build.gradle.kts

@@ -16,17 +16,6 @@ repositories {
 refinedarchitect {
     modId = "refinedstorage"
     fabric()
-    compileWithProject(project(":refinedstorage-common"))
-    compileWithProject(project(":refinedstorage-common-api"))
-    compileWithProject(project(":refinedstorage-fabric-api"))
-    addProject(project(":refinedstorage-core-api"))
-    addProject(project(":refinedstorage-resource-api"))
-    addProject(project(":refinedstorage-storage-api"))
-    addProject(project(":refinedstorage-network-api"))
-    addProject(project(":refinedstorage-network"))
-    addProject(project(":refinedstorage-grid-api"))
-    addProject(project(":refinedstorage-autocrafting-api"))
-    addProject(project(":refinedstorage-query-parser"))
     publishing {
         maven = true
         // curseForge = "243076"
@@ -38,6 +27,9 @@ base {
     archivesName.set("refinedstorage-fabric")
 }
 
+val commonJava by configurations.existing
+val commonResources by configurations.existing
+
 dependencies {
     modApi(libs.cloth.config) {
         exclude(group = "net.fabricmc.fabric-api")
@@ -48,4 +40,30 @@ dependencies {
     modApi(libs.modmenu)
     include(libs.cloth.config)
     include(libs.teamreborn.energy)
+
+    testCompileOnly(libs.apiguardian)
+
+    compileOnly(project(":refinedstorage-common"))
+    compileOnly(project(":refinedstorage-common-api"))
+    compileOnly(project(":refinedstorage-fabric-api"))
+    compileOnly(project(":refinedstorage-core-api"))
+    compileOnly(project(":refinedstorage-resource-api"))
+    compileOnly(project(":refinedstorage-storage-api"))
+    compileOnly(project(":refinedstorage-network-api"))
+    compileOnly(project(":refinedstorage-network"))
+    compileOnly(project(":refinedstorage-grid-api"))
+    compileOnly(project(":refinedstorage-autocrafting-api"))
+    compileOnly(project(":refinedstorage-query-parser"))
+    commonJava(project(path = ":refinedstorage-common", configuration = "commonJava"))
+    commonResources(project(path = ":refinedstorage-common", configuration = "commonResources"))
+    commonJava(project(path = ":refinedstorage-common-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-fabric-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-core-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-resource-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-storage-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-network-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-network", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-grid-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-autocrafting-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-query-parser", configuration = "commonJava"))
 }

refinedstorage-neoforge/build.gradle.kts

@@ -7,24 +7,44 @@ refinedarchitect {
     neoForge()
     gameTests()
     dataGeneration(project(":refinedstorage-common"))
-    compileWithProject(project(":refinedstorage-common"))
-    compileWithProject(project(":refinedstorage-common-api"))
-    compileWithProject(project(":refinedstorage-neoforge-api"))
-    compileWithProject(project(":refinedstorage-core-api"))
-    compileWithProject(project(":refinedstorage-resource-api"))
-    compileWithProject(project(":refinedstorage-storage-api"))
-    compileWithProject(project(":refinedstorage-network-api"))
-    compileWithProject(project(":refinedstorage-network"))
-    compileWithProject(project(":refinedstorage-grid-api"))
-    compileWithProject(project(":refinedstorage-autocrafting-api"))
-    compileWithProject(project(":refinedstorage-query-parser"))
     publishing {
         maven = true
         // curseForge = "243076"
         // modrinth = "refined-storage"
     }
 }
 
+val commonJava by configurations.existing
+val commonResources by configurations.existing
+
+dependencies {
+    testCompileOnly(libs.apiguardian)
+
+    compileOnly(project(":refinedstorage-common"))
+    compileOnly(project(":refinedstorage-common-api"))
+    compileOnly(project(":refinedstorage-neoforge-api"))
+    compileOnly(project(":refinedstorage-core-api"))
+    compileOnly(project(":refinedstorage-resource-api"))
+    compileOnly(project(":refinedstorage-storage-api"))
+    compileOnly(project(":refinedstorage-network-api"))
+    compileOnly(project(":refinedstorage-network"))
+    compileOnly(project(":refinedstorage-grid-api"))
+    compileOnly(project(":refinedstorage-autocrafting-api"))
+    compileOnly(project(":refinedstorage-query-parser"))
+    commonJava(project(path = ":refinedstorage-common", configuration = "commonJava"))
+    commonResources(project(path = ":refinedstorage-common", configuration = "commonResources"))
+    commonJava(project(path = ":refinedstorage-common-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-neoforge-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-core-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-resource-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-storage-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-network-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-network", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-grid-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-autocrafting-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-query-parser", configuration = "commonJava"))
+}
+
 base {
     archivesName.set("refinedstorage-neoforge")
 }