Use brand spankin new Ferry multi-platform.

TerraformersMC · Apr 11, 2024 · a70bce6 · a70bce6
1 parent 93b95dd
commit a70bce6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -46,8 +46,7 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: Build
-        #run: ./gradlew generateChangelog build publish publishMods -Pgithub -Pmodrinth -Pcurseforge -Pdiscord -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}" --stacktrace
-        run: ./gradlew generateChangelog build publish -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}" --stacktrace
+        run: ./gradlew generateChangelog build publish publishMods -Pgithub -Pmodrinth -Pcurseforge -Pdiscord -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}" --stacktrace
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

diff --git a/build.gradle b/build.gradle
@@ -18,13 +18,16 @@ subprojects {
     }
 }
 
+// Ferry for publishing; this has to be after arch dev plugin apply and before subproject version is set.
+apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/3.0-beta/ferry-mpp.gradle'
+
 allprojects {
     apply plugin: "java"
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
 
-    version = rootProject.mod_version
     group = rootProject.maven_group
+    version = rootProject.version
 
     repositories {
         mavenCentral()

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -2,9 +2,6 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
-// Ferry for publishing
-apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/3.0-beta/ferry-mpp.gradle'
-
 architectury {
     platformSetupLoomIde()
     fabric()

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -2,9 +2,6 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
-// Ferry for publishing
-apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/3.0-beta/ferry-mpp.gradle'
-
 architectury {
     platformSetupLoomIde()
     forge()

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -2,9 +2,6 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
-// Ferry for publishing
-apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/3.0-beta/ferry-mpp.gradle'
-
 architectury {
     platformSetupLoomIde()
     neoForge()