Merge branch 'multiversion/dev' into feature/splitscreen

Author: isXander

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Get potential versions
         id: generate-matrix
         run: |
-          MATRIX=$(jq -c '{include: (.branches[""] | map({target: ., experimental: (test("exp"))}))}' ./versions/branches.json)
+          MATRIX=$(jq -c '{include: (.branches[""] | map({target: ., experimental: (test("exp"))}))}' ./versions/versions.json)
           echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
 
   build:
@@ -51,14 +51,22 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: false
+      - name: Overwrite current version
+        run: printf "${{ matrix.target }}" | cut -d':' -f1 > ./versions/current
       - name: Build ${{ matrix.target }}
         run: ./gradlew "Refresh active project" buildAndCollectActive --stacktrace
         env:
           CI_SINGLE_BUILD: ${{ matrix.target }}
+
+      - name: Sanitize artifact name
+        run: |
+          raw="${{ matrix.target }}"
+          clean="${raw%%:*}"
+          echo "ARTIFACT_NAME=$clean" >> $GITHUB_ENV
       - uses: actions/upload-artifact@v4
         with:
           path: build/finalJars/*.jar
-          name: ${{ matrix.target }}
+          name: ${{ env.ARTIFACT_NAME }}
 
 #  run:
 #    needs: build

build.gradle.kts

@@ -1,7 +1,9 @@
 import dev.isxander.controlify.*
 
 plugins {
+    id("dev.kikugie.stonecutter")
     id("dev.isxander.controlify.project")
+
     id("me.modmuss50.mod-publish-plugin")
     `maven-publish`
 

buildSrc/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
 
     implementation(plugin("dev.isxander.modstitch.base", "0.5.16-unstable"))
-    implementation(plugin("dev.kikugie.stonecutter", "0.7-alpha.8"))
+    implementation(plugin("dev.kikugie.stonecutter", "0.7-alpha.9"))
     implementation(plugin("fabric-loom", "1.10.5"))
     implementation(plugin("net.neoforged.moddev", "2.0.80"))
 }

buildSrc/src/main/kotlin/dev/isxander/controlify/project.gradle.kts

@@ -97,21 +97,21 @@ if (modstitch.isLoom) {
 Setup stonecutter for the project.
  */
 stonecutter.apply {
-    consts(
-        "fabric" to modstitch.isLoom,
-        "neoforge" to modstitch.isModDevGradleRegular,
-        "immediately-fast" to isPropDefined("deps.immediatelyFast"),
-        "iris" to isPropDefined("deps.iris"),
-        "mod-menu" to isPropDefined("deps.modMenu"),
-        "sodium" to isPropDefined("deps.sodium"),
-        "simple-voice-chat" to isPropDefined("deps.simpleVoiceChat"),
-        "reeses-sodium-options" to isPropDefined("deps.reesesSodiumOptions"),
-        "fancy-menu" to isPropDefined("deps.fancyMenu"),
-    )
-
-    dependencies(
-        "fapi" to (findProperty("deps.fabricApi")?.toString() ?: "0.0.0"),
-    )
+    constants {
+        put("fabric", modstitch.isLoom)
+        put("neoforge", modstitch.isModDevGradleRegular)
+        put("immediately-fast", isPropDefined("deps.immediatelyFast"))
+        put("iris", isPropDefined("deps.iris"))
+        put("mod-menu", isPropDefined("deps.modMenu"))
+        put("sodium", isPropDefined("deps.sodium"))
+        put("simple-voice-chat", isPropDefined("deps.simpleVoiceChat"))
+        put("reeses-sodium-options", isPropDefined("deps.reesesSodiumOptions"))
+        put("fancy-menu", isPropDefined("deps.fancyMenu"))
+    }
+
+    dependencies {
+        put("fapi", prop("deps.fabricApi") ?: "0.0.0")
+    }
 }
 
 tasks.named<ProcessResources>("generateModMetadata") {

settings.gradle.kts

@@ -14,7 +14,7 @@ pluginManagement {
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.7-alpha.8"
+    id("dev.kikugie.stonecutter") version "0.7-alpha.9"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 

stonecutter.gradle.kts

@@ -11,14 +11,7 @@ plugins {
     id("dev.isxander.modstitch.base") apply false
 }
 
-val ciSingleBuild: String? = System.getenv("CI_SINGLE_BUILD")
-if (ciSingleBuild != null) {
-    stonecutter active ciSingleBuild
-} else {
-    stonecutter active file("versions/current")
-}
-
-stonecutter.tree.nodes.forEach { it.project.plugins.apply("dev.kikugie.stonecutter") }
+stonecutter active file("versions/current")
 
 val releaseMod by tasks.registering {
     group = "controlify"