fix: use multidex to fix build

butzist · Dec 26, 2023 · 7881192 · 7881192
1 parent 3e66427
commit 7881192
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/android-master.yml b/.github/workflows/android-master.yml
@@ -19,7 +19,7 @@ jobs:
         java-version: 17
         cache: 'gradle'
     - name: Prepare Android keystore
-      run: echo ${{ secrets.ENCODEDKEYSTORE }} | base64 --decode > ActivityLauncherApp/keystore.jks
+      run: echo ${{ secrets.ENCODEDKEYSTORE }} | base64 --decode > app/keystore.jks
     - name: Download dependencies
       run: ./gradlew androidDependencies
     - name: Build release APK
@@ -33,4 +33,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: release.apk
-        path: ActivityLauncherApp/build/outputs/apk/release/ActivityLauncherApp-release.apk
+        path: app/build/outputs/apk/release/app-release.apk
diff --git a/.github/workflows/android-pr.yml b/.github/workflows/android-pr.yml
@@ -23,4 +23,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: debug.apk
-        path: ActivityLauncherApp/build/outputs/apk/debug/ActivityLauncherApp-debug.apk
+        path: app/build/outputs/apk/debug/app-debug.apk
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -21,7 +21,7 @@ jobs:
         java-version: 17
         cache: 'gradle'
     - name: Prepare Android keystore
-      run: echo ${{ secrets.ENCODEDKEYSTORE }} | base64 --decode > ActivityLauncherApp/keystore.jks
+      run: echo ${{ secrets.ENCODEDKEYSTORE }} | base64 --decode > app/keystore.jks
     - name: Download dependencies
       run: ./gradlew androidDependencies
     - name: Build release AAB
@@ -42,16 +42,16 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: release.apk
-        path: ActivityLauncherApp/build/outputs/apk/release/ActivityLauncherApp-release.apk
+        path: app/build/outputs/apk/release/app-release.apk
     - name: Upload Android Release to Play Store
       uses: r0adkll/upload-google-play@v1
       with:
         serviceAccountJsonPlainText: ${{ secrets.SERVICEACCOUNT }}
         packageName: de.szalkowski.activitylauncher
-        releaseFiles: ActivityLauncherApp/build/outputs/bundle/release/*.aab
+        releaseFiles: app/build/outputs/bundle/release/*.aab
         releaseName: ${{ steps.version.outputs.tag }}
         track: beta
         inAppUpdatePriority: 0
         status: completed
         whatsNewDirectory: whatsnew
-        mappingFile: ActivityLauncherApp/build/outputs/mapping/release/mapping.txt
+        mappingFile: app/build/outputs/mapping/release/mapping.txt
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,11 +12,12 @@ android {
 
     defaultConfig {
         applicationId = "de.szalkowski.activitylauncher"
-        minSdk = 19
+        minSdk = 16
         targetSdk = 34
         versionCode = 50
         versionName = "2.0.0"
 
+        multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -64,6 +65,7 @@ kapt {
 dependencies {
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.multidex:multidex:2.0.1")
     implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")

diff --git a/app/src/main/java/de/szalkowski/activitylauncher/ActivityLauncherApp.kt b/app/src/main/java/de/szalkowski/activitylauncher/ActivityLauncherApp.kt
@@ -1,14 +1,15 @@
 package de.szalkowski.activitylauncher
 
 import android.app.Application
+import androidx.multidex.MultiDexApplication
 import androidx.preference.PreferenceManager
 import dagger.hilt.android.HiltAndroidApp
 import de.szalkowski.activitylauncher.services.RootDetectionService
 import de.szalkowski.activitylauncher.services.SettingsService
 import javax.inject.Inject
 
 @HiltAndroidApp
-class ActivityLauncherApp : Application() {
+class ActivityLauncherApp : MultiDexApplication() {
     @Inject
     internal lateinit var settingsService: SettingsService