testing android release

j-roskopf · Nov 20, 2023 · 02cde18 · 02cde18
1 parent c217238
commit 02cde18
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 14 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    tags:
+    branches:
       - 'release/[0-9]+.[0-9]+.[0-9]+'
 
 permissions:
@@ -39,9 +39,10 @@ jobs:
         run: ./gradlew detektAll
 
   android:
-    needs: [code-style]
     runs-on: ubuntu-latest
     timeout-minutes: 60
+    env:
+      GOOGLE_PLAY_API_CREDENTIALS: ${{ secrets.GOOGLE_PLAY_API_CREDENTIALS }}
 
     steps:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
@@ -59,18 +60,36 @@ jobs:
         with:
           cache-disabled: true
 
-      - name: Build Android App
-        run: |
-          ./gradlew \
-            :androidApp:bundle \
-            :androidApp:build
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v1
+        with:
+          fileName: 'keystore/keystore.jks'
+          encodedString: ${{ secrets.KEYSTORE }}
+
+      - name: build prod
+        run: ./gradlew :androidApp:bundleRelease
+        env:
+          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+
+      - name: create-json
+        id: create-json
+        uses: jsdaniell/create-json@v1.2.2
+        with:
+          name: "sync_sphere_google_play_api_credentials.json"
+          json: ${{ secrets.GOOGLE_PLAY_API_CREDENTIALS }}
+
+      - name: upload to play store
+        run: bundle exec fastlane supply --aab androidApp/build/outputs/bundle/release/androidApp-release.aab
 
       - name: Upload build outputs
         if: always()
         uses: actions/upload-artifact@v3
         with:
           name: android-build-outputs
-          path: androidApp/build/outputs/apk/
+          path: androidApp/build/outputs/
 
   ios:
     needs: [ code-style ]

diff --git a/README.md b/README.md
@@ -40,3 +40,14 @@ iOS and Android are already configured for debug.
 ```groovy
 systemProp.syncSphereDebug=true
 ```
+
+## TODO
+- android publishing on CI
+- last visited rooms UI
+
+
+
+Account ID: 8141364126117566836
+syncsphere-android-publishing@syncsphere-37dca.iam.gserviceaccount.com
+
+openssl base64 < mncs_keystore.jks | tr -d '\n' | tee keystore.txt
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -34,6 +34,15 @@ android {
         versionName = findProperty("android.versionName") as String
     }
 
+    signingConfigs {
+        create("release") {
+            storePassword = System.getenv("SIGNING_STORE_PASSWORD")
+            keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
+            storeFile = file("keystore/keystore.jks")
+            keyAlias = System.getenv("SIGNING_KEY_ALIAS")
+        }
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get())
         targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get())

diff --git a/fastlane/Appfile b/fastlane/Appfile
@@ -1,4 +1,9 @@
 team_name "Joseph Roskopf"
 team_id "LVCF4PVSY3"
 itc_team_id "126727947"
-itc_team_name "Joseph Roskopf"
+itc_team_name "Joseph Roskopf"
+
+json_key_file("sync_sphere_google_play_api_credentials.json")
+package_name("com.joetr.sync.sphere")
+
+#fastlane supply --aab path/to/app.aab
diff --git a/shared/src/commonMain/kotlin/com/joetr/sync/sphere/data/RoomConstants.kt b/shared/src/commonMain/kotlin/com/joetr/sync/sphere/data/RoomConstants.kt
@@ -24,6 +24,7 @@ class RoomConstants(private val buildConfig: BuildConfig) {
         }
     }
 }
+
 interface BuildConfig {
     fun isDebug(): Boolean
 }

diff --git a/shared/src/commonMain/kotlin/com/joetr/sync/sphere/ui/pre/PreRoomScreen.kt b/shared/src/commonMain/kotlin/com/joetr/sync/sphere/ui/pre/PreRoomScreen.kt
@@ -142,10 +142,8 @@ class PreRoomScreen : Screen {
                         )
                     },
                     validateRoomCode = {
-                        val (name, isAnonymous) = if (nameText.value.isNotEmpty()) {
-                            Pair(nameText.value, false)
-                        } else {
-                            Pair(screenModel.getAnonymousUsername(), true)
+                        val name = nameText.value.ifEmpty {
+                            screenModel.getAnonymousUsername()
                         }
 
                         screenModel.validateRoomCode(

diff --git a/shared/src/desktopMain/kotlin/com/joetr/sync/sphere/data/BuildConfigImpl.kt b/shared/src/desktopMain/kotlin/com/joetr/sync/sphere/data/BuildConfigImpl.kt
@@ -1,7 +1,6 @@
 package com.joetr.sync.sphere.data
 
 actual class BuildConfigImpl() : BuildConfig {
-
     override fun isDebug(): Boolean {
         val debugSystemProperty = System.getProperty("syncSphereDebug")
         return debugSystemProperty?.toBoolean() ?: false