Update build.gradle

Author: lonefelidae16

.github/workflows/build.yml

@@ -36,6 +36,10 @@ jobs:
           fi
           echo "SHORT_SHA=$(echo $COMMIT_SHA | cut -c1-8)" >> $GITHUB_ENV
 
+      - name: Export Version
+        if: github.ref_type == 'tag'
+        run: echo "VERSION=${GITHUB_REF_NAME#*/}" >> $GITHUB_ENV
+
       - name: Java ${{ matrix.java }} setup
         uses: actions/setup-java@v4
         with:
@@ -51,7 +55,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Gradle build
-        run: ./gradlew build
+        run: ./gradlew build -PverStr=${VERSION}
 
       - name: Capture build artifacts
         if: ${{ runner.os == 'Linux' }} # Only upload artifacts built from LTS java on one OS
@@ -61,7 +65,7 @@ jobs:
           path: build/libs/
 
       - name: Create GitHub Release
-        if: startsWith(github.ref, 'refs/tags/')
+        if: github.ref_type == 'tag'
         uses: softprops/action-gh-release@v2
         with:
           files: build/libs/*.jar

build.gradle

@@ -11,6 +11,15 @@ var targetJavaLang = Integer.parseInt(project.java_lang_version)
 
 tasks.runClient.dependsOn(build)
 
+var verStr = (project.findProperty('verStr') ?: versionDetails().gitHash[0..7]).toString()
+var buildNum = ''
+if (verStr.contains('-')) {
+    var spl = verStr.split('-')
+    verStr = spl[0]
+    buildNum = "-${spl[1]}"
+}
+version = "${project.mod_version}+${verStr}~lonefelidae16${buildNum}"
+
 allprojects {
     version = "${project.mod_version}+${versionDetails().gitHash[0..7]}~lonefelidae16"
     group = project.maven_group
@@ -95,9 +104,9 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.minecraft_version}${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-    modImplementation include("me.lonefelidae16:groominglib:${project.groom_version}")
+
+    implementation include("me.lonefelidae16:groominglib:${project.groom_version}")
 
     // <editor-fold desc="Extra Sounds modules">
     compileOnly include(project(path: 'logics'))

gradle.properties

@@ -1,6 +1,8 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configureondemand=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
 minecraft_version=1.21.8

logics/build.gradle

@@ -12,8 +12,8 @@ dependencies {
     minecraft "com.mojang:minecraft:${extraSounds.minecraft_version}"
     mappings "net.fabricmc:yarn:${extraSounds.minecraft_version}${extraSounds.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${extraSounds.loader_version}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${extraSounds.fabric_api_version}"
-    modImplementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
+
+    implementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
 
     compileOnly project(path: ':sound-categories:shared')
 

sound-categories

@@ -12,8 +12,8 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.minecraft_version}${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-    modImplementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
+
+    implementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
 
     implementation project(path: extraSounds.project('logics').path, configuration: 'namedElements')
 }

versioned/es1.18.2/build.gradle

@@ -1,3 +1,2 @@
 minecraft_version=1.18.2
 yarn_mappings=+build.4
-fabric_api_version=0.77.0+1.18.2

versioned/es1.18.2/gradle.properties

@@ -12,8 +12,8 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.minecraft_version}${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-    modImplementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
+
+    implementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
 
     implementation project(path: extraSounds.project('logics').path, configuration: 'namedElements')
 }

versioned/es1.18/build.gradle

@@ -1,3 +1,2 @@
 minecraft_version=1.18
 yarn_mappings=+build.1
-fabric_api_version=0.44.0+1.18

versioned/es1.18/gradle.properties

@@ -12,8 +12,8 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.minecraft_version}${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-    modImplementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
+
+    implementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
 
     implementation project(path: extraSounds.project('logics').path, configuration: 'namedElements')
 }