Use branch tag for versioning

Author: Joe3112

.github/workflows/deploy.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: JDK setup
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 20
           distribution: corretto
@@ -24,14 +24,43 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
+      - name: Derive versionName / versionCode
+        id: ver
+        shell: bash
+        run: |
+          # versionName
+          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
+            VERSION_NAME="${GITHUB_REF#refs/tags/v}"     # v1.4.2 -> 1.4.2
+          else
+            LAST_TAG="$(git describe --tags --abbrev=0 2>/dev/null || echo v0.0.0)"
+            VERSION_NAME="${LAST_TAG#v}-SNAPSHOT+${GITHUB_SHA::7}"
+          fi
+          
+          # A) From SemVer (x.y.z -> x*10000 + y*100 + z)
+          MAJOR="${VERSION_NAME%%.*}"; rest="${VERSION_NAME#*.}"
+          MINOR="${rest%%.*}"; PATCH="${rest#*.}"
+          PATCH="${PATCH%%-*}" # strip -SNAPSHOT if present
+          if [[ "$MAJOR" =~ ^[0-9]+$ && "$MINOR" =~ ^[0-9]+$ && "$PATCH" =~ ^[0-9]+$ ]]; then
+            VC=$((10#${MAJOR}*10000 + 10#${MINOR}*100 + 10#${PATCH}))
+          else
+            # B) Fallback for snapshots: time-based code (UTC yyyymmddHH)
+            VC="$(date -u +%Y%m%d%H)"
+          fi
+          
+          echo "version_name=${VERSION_NAME}" >> $GITHUB_OUTPUT
+          echo "version_code=${VC}" >> $GITHUB_OUTPUT  
+
       - name: Assemble Release Bundle
         env:
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           GOOGLE_SERVER_CLIENT_ID: ${{ secrets.GOOGLE_SERVER_CLIENT_ID }}
           SUPABASE_KEY: ${{ secrets.SUPABASE_KEY }}
           SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
         run: |
-          ./gradlew bundleRelease
+          ./gradlew \
+            -PVERSION_NAME="${{ steps.ver.outputs.version_name }}" \
+            -PVERSION_CODE="${{ steps.ver.outputs.version_code }}" \
+            bundleRelease
 
       - name: Sign Release
         uses: r0adkll/sign-android-release@v1

composeApp/build.gradle.kts

@@ -257,10 +257,15 @@ kotlin {
   }
 }
 
-val projectVersionName = project.findProperty("app.morestuff.versionName") as? String
-  ?: error("versionName undefined!")
-val projectVersionCode = (project.findProperty("app.morestuff.versionCode") as? String)?.toInt()
-  ?: error("versionCode undefined!")
+val projectVersionName =
+  providers.gradleProperty("VERSION_NAME").orNull
+    ?: project.findProperty("app.morestuff.versionName") as? String
+    ?: error("versionName undefined!")
+
+val projectVersionCode =
+  providers.gradleProperty("VERSION_CODE").orNull?.toInt()
+    ?: (project.findProperty("app.morestuff.versionCode") as? String)?.toInt()
+    ?: error("versionCode undefined!")
 
 buildConfig {