Remove Multidex usages.

Since the min SDK is at least 21, it is no longer necessary to use the Multidex library. See the following for more info: https://developer.android.com/build/multidex#mdex-on-l Resolves #13696
mollyim · Sep 20, 2024 · b340097 · b340097
1 parent a1bf4d6
commit b340097
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 22 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -178,8 +178,6 @@ android {
     minSdk = signalMinSdkVersion
     targetSdk = signalTargetSdkVersion
 
-    multiDexEnabled = true
-
     vectorDrawables.useSupportLibrary = true
     project.ext.set("archivesBaseName", "Signal")
 
@@ -504,7 +502,6 @@ dependencies {
   implementation(libs.androidx.compose.runtime.livedata)
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.constraintlayout)
-  implementation(libs.androidx.multidex)
   implementation(libs.androidx.navigation.fragment.ktx)
   implementation(libs.androidx.navigation.ui.ktx)
   implementation(libs.androidx.navigation.compose)
@@ -598,7 +595,6 @@ dependencies {
   testImplementation(testLibs.robolectric.robolectric) {
     exclude(group = "com.google.protobuf", module = "protobuf-java")
   }
-  testImplementation(testLibs.robolectric.shadows.multidex)
   testImplementation(testLibs.bouncycastle.bcprov.jdk15on) {
     version {
       strictly("1.70")

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -16,13 +16,13 @@
  */
 package org.thoughtcrime.securesms;
 
+import android.app.Application;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
-import androidx.multidex.MultiDexApplication;
 
 import com.bumptech.glide.Glide;
 import com.google.android.gms.security.ProviderInstaller;
@@ -129,7 +129,7 @@
  *
  * @author Moxie Marlinspike
  */
-public class ApplicationContext extends MultiDexApplication implements AppForegroundObserver.Listener {
+public class ApplicationContext extends Application implements AppForegroundObserver.Listener {
 
   private static final String TAG = Log.tag(ApplicationContext.class);
 

diff --git a/app/src/main/res/raw/third_party_licenses b/app/src/main/res/raw/third_party_licenses
@@ -356,7 +356,6 @@ The following dependencies are licensed under The MIT License:
 * mockito-android (https://github.com/mockito/mockito)
 * mockito-core (https://github.com/mockito/mockito)
 * mockito-inline (https://github.com/mockito/mockito)
-* multidex (http://robolectric.org)
 * nativeruntime (http://robolectric.org)
 * pluginapi (http://robolectric.org)
 * reflector (http://robolectric.org)

diff --git a/build-logic/plugins/src/main/java/signal-library.gradle.kts b/build-logic/plugins/src/main/java/signal-library.gradle.kts
@@ -28,7 +28,6 @@ android {
   defaultConfig {
     minSdk = signalMinSdkVersion
     targetSdk = signalTargetSdkVersion
-    multiDexEnabled = true
   }
 
   compileOptions {
@@ -58,7 +57,6 @@ dependencies {
   implementation(libs.rxjava3.rxandroid)
   implementation(libs.rxjava3.rxjava)
   implementation(libs.rxjava3.rxkotlin)
-  implementation(libs.androidx.multidex)
   implementation(libs.kotlin.stdlib.jdk8)
 
   ktlintRuleset(libs.ktlint.twitter.compose)

diff --git a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
@@ -33,7 +33,6 @@ android {
 
     minSdk = signalMinSdkVersion
     targetSdk = signalTargetSdkVersion
-    multiDexEnabled = true
   }
 
   compileOptions {
@@ -69,7 +68,6 @@ dependencies {
   implementation(libs.rxjava3.rxandroid)
   implementation(libs.rxjava3.rxjava)
   implementation(libs.rxjava3.rxkotlin)
-  implementation(libs.androidx.multidex)
   implementation(libs.material.material)
   implementation(libs.androidx.constraintlayout)
   implementation(libs.kotlin.stdlib.jdk8)

diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
@@ -74,7 +74,6 @@ dependencyResolutionManagement {
       library("androidx-media3-ui", "androidx.media3", "media3-ui").versionRef("androidx-media3")
       library("androidx-media3-decoder", "androidx.media3", "media3-decoder").versionRef("androidx-media3")
       library("androidx-media3-common", "androidx.media3", "media3-common").versionRef("androidx-media3")
-      library("androidx-multidex", "androidx.multidex:multidex:2.0.1")
       library("androidx-navigation-fragment-ktx", "androidx.navigation", "navigation-fragment-ktx").versionRef("androidx-navigation")
       library("androidx-navigation-ui-ktx", "androidx.navigation", "navigation-ui-ktx").versionRef("androidx-navigation")
       library("androidx-navigation-compose", "androidx.navigation", "navigation-compose").versionRef("androidx-navigation")
@@ -203,7 +202,6 @@ dependencyResolutionManagement {
       library("mockito-kotlin", "org.mockito.kotlin:mockito-kotlin:4.0.0")
       library("mockito-android", "org.mockito:mockito-android:4.6.1")
       library("robolectric-robolectric", "org.robolectric", "robolectric").versionRef("robolectric")
-      library("robolectric-shadows-multidex", "org.robolectric", "shadows-multidex").versionRef("robolectric")
       library("bouncycastle-bcprov-jdk15on", "org.bouncycastle:bcprov-jdk15on:1.70")
       library("bouncycastle-bcpkix-jdk15on", "org.bouncycastle:bcpkix-jdk15on:1.70")
       library("hamcrest-hamcrest", "org.hamcrest:hamcrest:2.2")

diff --git a/device-transfer/lib/build.gradle.kts b/device-transfer/lib/build.gradle.kts
@@ -14,7 +14,6 @@ dependencies {
   testImplementation(testLibs.robolectric.robolectric) {
     exclude(group = "com.google.protobuf", module = "protobuf-java")
   }
-  testImplementation(testLibs.robolectric.shadows.multidex)
   testImplementation(testLibs.hamcrest.hamcrest)
 
   testImplementation(testFixtures(project(":libsignal-service")))

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -8979,14 +8979,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="126f485b5f1570021ab79a2b819bf44a2f64405bd248f7e819236f13728b9ce7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.robolectric" name="shadows-multidex" version="4.10.3">
-         <artifact name="shadows-multidex-4.10.3.jar">
-            <sha256 value="34d1da27044528c07ca43c6334af3890868f2570d48114459c25ec4331ea6966" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="shadows-multidex-4.10.3.module">
-            <sha256 value="ad1276a3820bbe37672624ee412b14bf35660604fb4802ac9b2ce8de494b72ff" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.robolectric" name="utils" version="4.10.3">
          <artifact name="utils-4.10.3.jar">
             <sha256 value="0081b1a65c2c6d7cf56a56f6b4ed85b35a91f5a9f40a4b81c6771b497265518e" origin="Generated by Gradle"/>