Adjust versioning for GPlay wear os bundle upload

Version bump
Fix Github release for WearOS APK
2026-09-14 18:26:11 -04:00 · 2022-09-14 19:39:30 +02:00 · 2022-09-14 18:59:08 +02:00 · 2022-09-14 18:31:34 +02:00
4 changed files with 11 additions and 7 deletions
@@ -68,7 +68,9 @@ jobs:
          tag_name: ${{ steps.tagger.outputs.tag }}
          name: ${{ steps.tagger.outputs.tag }}
          generate_release_notes: true
-          files: app/build/outputs/apk/foss/beta/*.apk
+          files: |
+            app/build/outputs/apk/foss/beta/*.apk
+            app-wear/build/outputs/apk/foss/beta/*.apk
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -80,7 +82,9 @@ jobs:
          tag_name: ${{ steps.tagger.outputs.tag }}
          name: ${{ steps.tagger.outputs.tag }}
          generate_release_notes: true
-          files: app/build/outputs/apk/foss/release/*.apk
+          files: |
+            app/build/outputs/apk/foss/release/*.apk
+            app-wear/build/outputs/apk/foss/release/*.apk
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -17,7 +17,7 @@ android {
        minSdk = ProjectConfig.minSdk
        targetSdk = ProjectConfig.targetSdk

-        versionCode = ProjectConfig.Version.code
+        versionCode = ProjectConfig.Version.code + 1 // Wear app
        versionName = ProjectConfig.Version.name

        testInstrumentationRunner = "eu.darken.capod.HiltTestRunner"
@@ -90,7 +90,7 @@ android {
        val variantName: String = variantOutputImpl.name

        if (listOf("release", "beta").any { variantName.toLowerCase().contains(it) }) {
-            val outputFileName = ProjectConfig.packageName +
+            val outputFileName = ProjectConfig.packageName + "-WEAROS" +
                    "-v${defaultConfig.versionName}-${defaultConfig.versionCode}" +
                    "-${variantName.toUpperCase()}-${lastCommitHash()}.apk"

@@ -18,7 +18,7 @@ android {
        minSdk = ProjectConfig.minSdk
        targetSdk = ProjectConfig.targetSdk

-        versionCode = ProjectConfig.Version.code
+        versionCode = ProjectConfig.Version.code + 0 // Base app
        versionName = ProjectConfig.Version.name

        testInstrumentationRunner = "eu.darken.capod.HiltTestRunner"
@@ -17,10 +17,10 @@ object ProjectConfig {
        const val major = 2
        const val minor = 0
        const val patch = 0
-        const val build = 0
+        const val build = 2

        const val name = "${major}.${minor}.${patch}-rc${build}"
-        const val code = major * 1000000 + minor * 10000 + patch * 100 + build
+        const val code = major * 10000000 + minor * 100000 + patch * 1000 + build * 10
    }
 }
Author	SHA1	Message	Date
darken	84b7509f33	Adjust versioning for GPlay wear os bundle upload	2022-09-14 19:39:30 +02:00
darken	a53baec9dc	Version bump	2022-09-14 18:59:08 +02:00
darken	4b4bc86cf7	Fix Github release for WearOS APK	2022-09-14 18:31:34 +02:00