Android fixes

- Also sign the apk - Bump dependencies
DRSchlaubi · May 31, 2023 · 58cebcf · 58cebcf
1 parent 62c2230
commit 58cebcf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -135,13 +135,21 @@ jobs:
           path: app/android/build/outputs/apk/release/*.apk
       - uses: r0adkll/sign-android-release@v1
         id: sign_bundle
-        name: Sign app APK
+        name: Sign AAB
         with:
           releaseDirectory: app/android/build/outputs/bundle/release/
           signingKeyBase64: ${{ secrets.KEYSTORE }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
-
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+      - uses: r0adkll/sign-android-release@v1
+        id: sign_bundle
+        name: Sign APK
+        with:
+          releaseDirectory: app/android/build/outputs/apk/release/
+          signingKeyBase64: ${{ secrets.KEYSTORE }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
       - uses: r0adkll/upload-google-play@v1
         name: Release on Play Store

diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts
@@ -34,7 +34,10 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = true
-            proguardFile("proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
 
             applicationVariants.all {
                 outputs.all {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -42,11 +42,11 @@ kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", vers
 lyricist = { group = "cafe.adriel.lyricist", name = "lyricist", version.ref = "lyricist" }
 lyricist-processor = { group = "cafe.adriel.lyricist", name = "lyricist-processor", version.ref = "lyricist" }
 
-logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.3.6" }
+logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.7" }
 
 kvault = { group = "com.liftric", name = "kvault", version = "1.10.0" }
 
-androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.7.1" }
+androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.7.2" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" }
 androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.10.1" }
 androidx-browser = { group = "androidx.browser", name = "browser", version = "1.5.0" }