fix: merge conflicts

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

.github/workflows/release.yml

@@ -205,19 +205,19 @@ jobs:
     needs: [release-google, release-fdroid]
     steps:
       - name: Download Google AAB
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: google-aab
           path: ./google/bundle
 
       - name: Download Google APK
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: google-apk
           path: ./google/apk
 
       - name: Download F-Droid APK
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: fdroid-apk
           path: ./fdroid

.ruby-version

@@ -1 +1 @@
-3.2
+3.4.5

RELEASE_PROCESS.md

@@ -77,16 +77,14 @@ git push origin v2.3.5-closed.1
 ```
 This triggers the workflow again, but this time it will send the build to the `NewAlpha` track for your closed testers. You can then continue the cycle of testing, fixing, and promoting all the way to production.
 
-### 4. Merging Back to `main`
-After the final production release is complete and verified, merge the release branch back into `main` to ensure any hotfixes are included. Then, delete the release branch.
-```bash
-git checkout main
-git pull origin main
-git merge release/2.3.5
-git push origin main
-git branch -d release/2.3.5
-git push origin --delete release/2.3.5
-```
+### 4. Finalizing the Release
+After the final production release is complete and verified, open a Pull Request to merge the release branch back into `main`. This ensures any hotfixes applied during the release cycle are properly reviewed and integrated.
+
+*   **Title:** `Release/2.3.5`
+*   **Base Branch:** `main`
+*   **Compare Branch:** `release/2.3.5`
+
+Once the PR is approved and merged, you can safely delete the release branch.
 
 ## Manual Finalization Steps
 

app/build.gradle.kts

@@ -16,6 +16,7 @@
  */
 
 import io.gitlab.arturbosch.detekt.Detekt
+import org.gradle.kotlin.dsl.invoke
 import java.io.FileInputStream
 import java.util.Properties
 
@@ -60,12 +61,18 @@ android {
         minSdk = Configs.MIN_SDK
         targetSdk = Configs.TARGET_SDK
         // Prioritize injected props, then ENV, then fallback to git commit count
-        versionCode = (project.findProperty("android.injected.version.code")?.toString()?.toInt()
+        versionCode =
+            (
+                project.findProperty("android.injected.version.code")?.toString()?.toInt()
                     ?: System.getenv("VERSION_CODE")?.toInt()
-            ?: gitVersionProvider.get().toInt())
-        versionName = (project.findProperty("android.injected.version.name")?.toString()
+                    ?: gitVersionProvider.get().toInt()
+                )
+        versionName =
+            (
+                project.findProperty("android.injected.version.name")?.toString()
                     ?: System.getenv("VERSION_NAME")
-            ?: Configs.VERSION_NAME_BASE)
+                    ?: Configs.VERSION_NAME_BASE
+                )
         testInstrumentationRunner = "com.geeksville.mesh.TestRunner"
         buildConfigField("String", "MIN_FW_VERSION", "\"${Configs.MIN_FW_VERSION}\"")
         buildConfigField("String", "ABS_MIN_FW_VERSION", "\"${Configs.ABS_MIN_FW_VERSION}\"")