From d683da2ddc8fce02baf7299eeccc5abdf3e30066 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Wed, 15 May 2024 18:38:31 +0200
Subject: [PATCH 1/4] chore: Update versions

---
 gradle/libs.versions.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 02d20d48..42a81fa5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-versionCode = "3"
+versionCode = "4"
 versionName = "NumberHub"
 
 androidxBrowserBrowser = "1.8.0"
 androidGradlePlugin = "8.3.2"
 androidxActivityActivityCompose = "1.9.0"
 androidxAppCompatAppCompat = "1.6.1"
-androidxCompose = "1.6.6"
+androidxCompose = "1.6.7"
 androidxComposeCompiler = "1.5.9"
 androidxComposeMaterial3 = "1.2.1"
-androidxCoreCoreKts = "1.13.0"
+androidxCoreCoreKts = "1.13.1"
 androidxGlanceGlance = "1.0.0"
-androidxDatastoreDatastorePreferences = "1.1.0"
+androidxDatastoreDatastorePreferences = "1.1.1"
 androidxEspresso = "3.5.1"
 androidxHiltHiltNavigationCompose = "1.2.0"
 androidxMacroBenchmark = "1.2.4"

From acc5d36d173818137554b00dc4d3a1af7be7894b Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Wed, 15 May 2024 19:31:40 +0200
Subject: [PATCH 2/4] feat(ci-cd): Add release app to Google Play ci:cd

---
 .../workflows/release-app-google-play.yaml    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 .github/workflows/release-app-google-play.yaml

diff --git a/.github/workflows/release-app-google-play.yaml b/.github/workflows/release-app-google-play.yaml
new file mode 100644
index 00000000..a941fef6
--- /dev/null
+++ b/.github/workflows/release-app-google-play.yaml
@@ -0,0 +1,43 @@
+name: Build and publish app to Google Play
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  release-app-google-play:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: gradle/wrapper-validation-action@v2
+
+      - name: Write KeyStore 🗝️
+        uses: ./.github/actions/prepare-keystore
+        with:
+          signingStorePassword: ${{ secrets.SIGNING_STORE_PASSWORD }}
+          signingKeyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+          signingKeyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
+          keyStoreBase64: ${{ secrets.KEYSTORE }}
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: 21
+          cache: 'gradle'
+
+      - name: Build Bundles 📱
+        run: ./gradlew bundleRelease
+
+      - name: Upload Bundles 🚀
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.GOOGLE_PLAY_STORE_SERVICE_ACCOUNT }}
+          packageName: app.myzel394.numberhub
+          releaseFiles: app/build/outputs/bundle/release/app-release.aab
+          track: production
+          status: inProgress
+          userFraction: 0.5

From 2f1d3a3084dd4594f7924a85a808e13c77355e32 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Wed, 15 May 2024 21:00:34 +0200
Subject: [PATCH 3/4] fix(ci-cd): Improve releasing

---
 .github/workflows/release-app-github.yaml      | 2 +-
 .github/workflows/release-app-google-play.yaml | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-app-github.yaml b/.github/workflows/release-app-github.yaml
index 7cfaafce..68914ab7 100644
--- a/.github/workflows/release-app-github.yaml
+++ b/.github/workflows/release-app-github.yaml
@@ -1,4 +1,4 @@
-name: Build and publish app
+name: Build and publish app (F-Droid variant)
 
 on:
   release:
diff --git a/.github/workflows/release-app-google-play.yaml b/.github/workflows/release-app-google-play.yaml
index a941fef6..94b728b8 100644
--- a/.github/workflows/release-app-google-play.yaml
+++ b/.github/workflows/release-app-google-play.yaml
@@ -1,4 +1,4 @@
-name: Build and publish app to Google Play
+name: Build and publish app to Google Play (Google Play variant)
 
 on:
   release:
@@ -32,12 +32,15 @@ jobs:
       - name: Build Bundles 📱
         run: ./gradlew bundleRelease
 
+      - name: Rename APK
+        run: mv app/build/outputs/bundle/playStoreRelease/app-playStore-release.aab NumberHub.aab
+
       - name: Upload Bundles 🚀
         uses: r0adkll/upload-google-play@v1
         with:
           serviceAccountJsonPlainText: ${{ secrets.GOOGLE_PLAY_STORE_SERVICE_ACCOUNT }}
           packageName: app.myzel394.numberhub
-          releaseFiles: app/build/outputs/bundle/release/app-release.aab
+          releaseFiles: NumberHub.aab
           track: production
           status: inProgress
           userFraction: 0.5

From 86b21832c5e2259be1b869c2fe99c0ccc71fde63 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Wed, 15 May 2024 21:04:35 +0200
Subject: [PATCH 4/4] feat(ci-cd): Upload all variants on debug APK build

---
 .github/workflows/build-testing.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-testing.yaml b/.github/workflows/build-testing.yaml
index 2a778571..9e7a8d20 100644
--- a/.github/workflows/build-testing.yaml
+++ b/.github/workflows/build-testing.yaml
@@ -36,4 +36,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: numberhub-app-debug-apks
-          path: app/build/outputs/apk/fdroid/debug/app-*-debug.apk
\ No newline at end of file
+          path: app/build/outputs/apk/*/debug/app-*-debug.apk