diff --git a/app/build.gradle.kts b/app/build.gradle.kts index de50614af9..45ff4f2988 100644 --- 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 index ed8b5e33d0..5792953542 100644 --- 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 @@ import rxdogtag2.RxDogTag; * * @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 index f604a76d85..4c395c33e8 100644 --- 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 index 0d97b4e3f8..b234f66764 100644 --- 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 index 7d7a3756c2..944ee5092f 100644 --- 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 index b93f922883..7ff3fd87c4 100644 --- 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 index 5ca621790e..f3c177aa66 100644 --- 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 index 0aa29796b3..da1a1222a2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -8979,14 +8979,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - -