fix demo apk

Calvin-LL · May 13, 2024 · 1949999 · 1949999
1 parent 4c1936a
commit 1949999
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/release-demo-app-apk.yaml b/.github/workflows/release-demo-app-apk.yaml
@@ -19,7 +19,7 @@ jobs:
           distribution: temurin
           java-version: 21
       - name: Build APK
-        run: ./gradlew assembleDebug --stacktrace
+        run: ./gradlew :demoApp:composeApp:assembleRelease --stacktrace
       - name: Get latest release
         id: latest_release
         uses: pozetroninc/github-action-get-latest-release@master
@@ -30,4 +30,4 @@ jobs:
       - name: Upload APK
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload ${{ steps.latest_release.outputs.release }} demoApp/composeApp/build/outputs/apk/debug/composeApp-debug.apk#demoApp.apk --clobber
+        run: gh release upload ${{ steps.latest_release.outputs.release }} demoApp/composeApp/build/outputs/apk/release/composeApp-release.apk#demoApp.apk --clobber
diff --git a/demoApp/composeApp/build.gradle.kts b/demoApp/composeApp/build.gradle.kts
@@ -82,9 +82,18 @@ android {
         res.srcDirs("src/androidMain/res")
         resources.srcDirs("src/commonMain/resources")
     }
+    signingConfigs {
+        create("release") {
+            storeFile = file("reorderable-apk.keystore")
+            storePassword = System.getenv("DEMO_APP_KEYSTORE_PASSWORD")
+            keyAlias = "demo-app"
+            keyPassword = System.getenv("APK_KEY_PASSWORD")
+        }
+    }
     buildTypes {
         release {
-            isMinifyEnabled = false
+            signingConfig = signingConfigs.getByName("release")
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -106,14 +115,6 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
-    signingConfigs {
-        create("release") {
-            storeFile = file("reorderable-apk.keystore")
-            storePassword = System.getenv("DEMO_APP_KEYSTORE_PASSWORD")
-            keyAlias = "demo-app"
-            keyPassword = System.getenv("APK_KEY_PASSWORD")
-        }
-    }
 }
 
 compose.desktop {