From b583454327309a626c443b6776835482c2cf643d Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Mon, 12 Jan 2026 15:25:18 +0100
Subject: [PATCH] fix(android): support pre-release versions in APK builds

- Update bump-android-version.js to handle RC/alpha/beta versions
- Pre-releases use versionCode suffix 0001-8999, stable uses 9000
- This ensures users can upgrade from RC to stable without uninstalling
- Skip Play Store upload for pre-release tags (GitHub only)
- Skip fastlane changelog generation for pre-releases

Fixes #5964
---
 .github/workflows/build-android.yml |  2 +-
 android/app/build.gradle            |  4 ++--
 tools/bump-android-version.js       | 35 ++++++++++++++++++++++-------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 987599b9a..aaba19507 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -116,7 +116,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload to Google Play Console
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-')
         uses: r0adkll/upload-google-play@v1.1.3
         with:
           serviceAccountJsonPlainText: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON }}
diff --git a/android/app/build.gradle b/android/app/build.gradle
index be604f7c3..7d2eecd8e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -20,8 +20,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 35
         compileSdk 35
-        versionCode 16_09_04_0000
-        versionName "16.9.4"
+        versionCode 17_00_00_0001
+        versionName "17.0.0-RC.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [
                 hostName       : "app.super-productivity.com",
diff --git a/tools/bump-android-version.js b/tools/bump-android-version.js
index 7a2af5d67..e87f9e94d 100644
--- a/tools/bump-android-version.js
+++ b/tools/bump-android-version.js
@@ -5,10 +5,11 @@ const path = require('path');
 const packageJson = require('../package.json');
 const version = packageJson.version;
 
-if (version.includes('-' || version.includes('rc'))) {
-  console.log('Version contains - or rc – skipping android version bump');
-  return;
-}
+// Parse version to extract pre-release info
+const versionParts = version.split('-');
+const baseVersion = versionParts[0]; // e.g., "17.0.0"
+const preRelease = versionParts[1]; // e.g., "RC.1" or undefined
+const isPreRelease = !!preRelease;
 
 String.prototype.insertAt = function (index, string) {
   return this.substr(0, index) + string + this.substr(index);
@@ -20,14 +21,27 @@ const gradleFilePath = path.join(__dirname, '..', 'android', 'app', 'build.gradl
 // Read the build.gradle file
 let gradleFileContent = fs.readFileSync(gradleFilePath, 'utf8');
 
-// Update the versionCode and versionName
-const versionCodeDroid =
-  version
+// Calculate versionCode
+const baseVersionCode =
+  baseVersion
     .split('.')
     .map((num) => num.padStart(2, '0'))
     .join('') * 10000;
+
+let versionCodeDroid;
+if (isPreRelease) {
+  // Pre-release: extract number (RC.1 → 1, alpha.5 → 5)
+  // Uses suffix 0001-8999 to be LOWER than stable (9000)
+  const preReleaseNum = parseInt(preRelease.split('.')[1] || '1', 10);
+  versionCodeDroid = baseVersionCode + preReleaseNum;
+} else {
+  // Stable release: use suffix 9000 to be HIGHER than any RC
+  versionCodeDroid = baseVersionCode + 9000;
+}
+
 const versionCodeDroidWithUnderscores = versionCodeDroid
   .toString()
+  .padStart(10, '0')
   .insertAt(6, '_')
   .insertAt(4, '_')
   .insertAt(2, '_');
@@ -46,6 +60,12 @@ fs.writeFileSync(gradleFilePath, gradleFileContent, 'utf8');
 
 console.log(`Updated build.gradle to version ${version}`);
 
+// Skip fastlane changelog for pre-release versions
+if (isPreRelease) {
+  console.log('Pre-release version – skipping fastlane changelog generation');
+  process.exit(0);
+}
+
 // CREATE fastlane changelog file
 // Define the paths
 const changelogPath = path.join(__dirname, '..', 'CHANGELOG.md');
@@ -90,4 +110,3 @@ if (!fs.existsSync(outputDir)) {
 fs.writeFileSync(outputFilePath, latestChanges, 'utf8');
 
 console.log(`Wrote latest changes to ${outputFilePath}`);
-// console.log(latestChanges);