ADFA-2278: Inject YY.ww release version into the build (#1479)

* ADFA-2278: Inject YY.ww release version into the build

Read the next_release_version Gradle property (from the NEXT_RELEASE_VERSION GitHub variable) into a new BuildInfo.RELEASE_VERSION field. release.yml validates and injects it at assemble time; a missing or malformed value fails the release build fast with no APK. Local and F-Droid builds leave the field empty.

* ADFA-2278: Fall back to 'Unknown' when next_release_version is not set

* Revert "ADFA-2278: Fall back to 'Unknown' when next_release_version is not set"

This reverts commit b6d2c35.

Author: Daniel-ADFA

.github/workflows/release.yml

@@ -486,12 +486,29 @@ jobs:
           echo "$GOOGLE_SERVICES_JSON" > app/google-services.json
           echo "google-services.json created successfully"
 
+      - name: Validate release version
+        env:
+          NEXT_RELEASE_VERSION: ${{ vars.NEXT_RELEASE_VERSION }}
+        run: |
+          if [ -z "$NEXT_RELEASE_VERSION" ]; then
+            echo "ERROR: NEXT_RELEASE_VERSION variable is not set"
+            exit 1
+          fi
+          if [[ ! "$NEXT_RELEASE_VERSION" =~ ^[0-9]{2}\.[0-9]{2}$ ]]; then
+            echo "ERROR: NEXT_RELEASE_VERSION format is invalid: $NEXT_RELEASE_VERSION"
+            echo "Expected format: YY.ww (two digits, dot, two digits, e.g., 25.50)"
+            exit 1
+          fi
+          echo "Validated NEXT_RELEASE_VERSION: $NEXT_RELEASE_VERSION"
+
       - name: Assemble Release APK
         env:
           INCLUDE_LLAMA_ASSETS: "true"
+          NEXT_RELEASE_VERSION: ${{ vars.NEXT_RELEASE_VERSION }}
         run: |
           variant_upper=$(echo "${{ matrix.variant }}" | tr '[:lower:]' '[:upper:]')
           flox activate -d flox/base -- ./gradlew :app:assemble${variant_upper}Release --no-daemon \
+            -Pnext_release_version="$NEXT_RELEASE_VERSION" \
             -Dorg.gradle.jvmargs="-Xmx10g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" \
             -Dandroid.aapt2.daemonHeapSize=4096M \
             -Dorg.gradle.workers.max=1 \

build-info/build.gradle.kts

@@ -23,6 +23,7 @@ import com.itsaky.androidide.build.config.ProjectConfig
 import com.itsaky.androidide.build.config.VersionUtils
 import com.itsaky.androidide.build.config.downloadVersion
 import com.itsaky.androidide.build.config.publishingVersion
+import com.itsaky.androidide.build.config.releaseVersion
 import com.itsaky.androidide.build.config.replaceContents
 import com.itsaky.androidide.build.config.simpleVersionName
 
@@ -57,6 +58,7 @@ tasks.create("generateBuildInfo") {
 					"MVN_GROUP_ID" to BuildConfig.PACKAGE_NAME,
 					"VERSION_NAME" to rootProject.version.toString(),
 					"VERSION_NAME_SIMPLE" to rootProject.simpleVersionName,
+					"RELEASE_VERSION" to rootProject.releaseVersion,
 					"VERSION_NAME_PUBLISHING" to rootProject.publishingVersion,
 					"VERSION_NAME_DOWNLOAD" to rootProject.downloadVersion,
 					"FDROID_BUILD" to FDroidConfig.isFDroidBuild.toString(),

build-info/src/main/java/com/itsaky/androidide/buildinfo/BuildInfo.java.in

@@ -39,6 +39,7 @@ public class BuildInfo {
 
   public static final String VERSION_NAME = "@@VERSION_NAME@@";
   public static final String VERSION_NAME_SIMPLE = "@@VERSION_NAME_SIMPLE@@";
+  public static final String RELEASE_VERSION = "@@RELEASE_VERSION@@";
   public static final String VERSION_NAME_PUBLISHING = "@@VERSION_NAME_PUBLISHING@@";
   public static final String VERSION_NAME_DOWNLOAD = "@@VERSION_NAME_DOWNLOAD@@";
 

composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/ProjectConfig.kt

@@ -17,6 +17,7 @@
 
 package com.itsaky.androidide.build.config
 
+import org.gradle.api.GradleException
 import org.gradle.api.Project
 import java.util.Locale
 
@@ -86,6 +87,17 @@ val Project.simpleVersionName: String
 		return simpleVersion
 	}
 
+val Project.releaseVersion: String
+	get() {
+		val raw = providers.gradleProperty("next_release_version").orNull.orEmpty().trim()
+		if (raw.isNotEmpty() && !Regex("""^\d{2}\.\d{2}$""").matches(raw)) {
+			throw GradleException(
+				"Invalid next_release_version '$raw'; expected YY.ww (two digits, dot, two digits), e.g. 25.47",
+			)
+		}
+		return raw
+	}
+
 private var shouldPrintVersionCode = true
 val Project.projectVersionCode: Int
 	get() {