Skip to content

Commit b340097

Browse files
MGaetan89greyson-signal
authored andcommitted
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 signalapp#13696
1 parent a1bf4d6 commit b340097

8 files changed

Lines changed: 2 additions & 22 deletions

File tree

app/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@ android {
178178
minSdk = signalMinSdkVersion
179179
targetSdk = signalTargetSdkVersion
180180

181-
multiDexEnabled = true
182-
183181
vectorDrawables.useSupportLibrary = true
184182
project.ext.set("archivesBaseName", "Signal")
185183

@@ -504,7 +502,6 @@ dependencies {
504502
implementation(libs.androidx.compose.runtime.livedata)
505503
implementation(libs.androidx.activity.compose)
506504
implementation(libs.androidx.constraintlayout)
507-
implementation(libs.androidx.multidex)
508505
implementation(libs.androidx.navigation.fragment.ktx)
509506
implementation(libs.androidx.navigation.ui.ktx)
510507
implementation(libs.androidx.navigation.compose)
@@ -598,7 +595,6 @@ dependencies {
598595
testImplementation(testLibs.robolectric.robolectric) {
599596
exclude(group = "com.google.protobuf", module = "protobuf-java")
600597
}
601-
testImplementation(testLibs.robolectric.shadows.multidex)
602598
testImplementation(testLibs.bouncycastle.bcprov.jdk15on) {
603599
version {
604600
strictly("1.70")

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
*/
1717
package org.thoughtcrime.securesms;
1818

19+
import android.app.Application;
1920
import android.content.Context;
2021

2122
import androidx.annotation.NonNull;
2223
import androidx.annotation.Nullable;
2324
import androidx.annotation.VisibleForTesting;
2425
import androidx.annotation.WorkerThread;
25-
import androidx.multidex.MultiDexApplication;
2626

2727
import com.bumptech.glide.Glide;
2828
import com.google.android.gms.security.ProviderInstaller;
@@ -129,7 +129,7 @@
129129
*
130130
* @author Moxie Marlinspike
131131
*/
132-
public class ApplicationContext extends MultiDexApplication implements AppForegroundObserver.Listener {
132+
public class ApplicationContext extends Application implements AppForegroundObserver.Listener {
133133

134134
private static final String TAG = Log.tag(ApplicationContext.class);
135135

app/src/main/res/raw/third_party_licenses

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ The following dependencies are licensed under The MIT License:
356356
* mockito-android (https://github.com/mockito/mockito)
357357
* mockito-core (https://github.com/mockito/mockito)
358358
* mockito-inline (https://github.com/mockito/mockito)
359-
* multidex (http://robolectric.org)
360359
* nativeruntime (http://robolectric.org)
361360
* pluginapi (http://robolectric.org)
362361
* reflector (http://robolectric.org)

build-logic/plugins/src/main/java/signal-library.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ android {
2828
defaultConfig {
2929
minSdk = signalMinSdkVersion
3030
targetSdk = signalTargetSdkVersion
31-
multiDexEnabled = true
3231
}
3332

3433
compileOptions {
@@ -58,7 +57,6 @@ dependencies {
5857
implementation(libs.rxjava3.rxandroid)
5958
implementation(libs.rxjava3.rxjava)
6059
implementation(libs.rxjava3.rxkotlin)
61-
implementation(libs.androidx.multidex)
6260
implementation(libs.kotlin.stdlib.jdk8)
6361

6462
ktlintRuleset(libs.ktlint.twitter.compose)

build-logic/plugins/src/main/java/signal-sample-app.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ android {
3333

3434
minSdk = signalMinSdkVersion
3535
targetSdk = signalTargetSdkVersion
36-
multiDexEnabled = true
3736
}
3837

3938
compileOptions {
@@ -69,7 +68,6 @@ dependencies {
6968
implementation(libs.rxjava3.rxandroid)
7069
implementation(libs.rxjava3.rxjava)
7170
implementation(libs.rxjava3.rxkotlin)
72-
implementation(libs.androidx.multidex)
7371
implementation(libs.material.material)
7472
implementation(libs.androidx.constraintlayout)
7573
implementation(libs.kotlin.stdlib.jdk8)

dependencies.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ dependencyResolutionManagement {
7474
library("androidx-media3-ui", "androidx.media3", "media3-ui").versionRef("androidx-media3")
7575
library("androidx-media3-decoder", "androidx.media3", "media3-decoder").versionRef("androidx-media3")
7676
library("androidx-media3-common", "androidx.media3", "media3-common").versionRef("androidx-media3")
77-
library("androidx-multidex", "androidx.multidex:multidex:2.0.1")
7877
library("androidx-navigation-fragment-ktx", "androidx.navigation", "navigation-fragment-ktx").versionRef("androidx-navigation")
7978
library("androidx-navigation-ui-ktx", "androidx.navigation", "navigation-ui-ktx").versionRef("androidx-navigation")
8079
library("androidx-navigation-compose", "androidx.navigation", "navigation-compose").versionRef("androidx-navigation")
@@ -203,7 +202,6 @@ dependencyResolutionManagement {
203202
library("mockito-kotlin", "org.mockito.kotlin:mockito-kotlin:4.0.0")
204203
library("mockito-android", "org.mockito:mockito-android:4.6.1")
205204
library("robolectric-robolectric", "org.robolectric", "robolectric").versionRef("robolectric")
206-
library("robolectric-shadows-multidex", "org.robolectric", "shadows-multidex").versionRef("robolectric")
207205
library("bouncycastle-bcprov-jdk15on", "org.bouncycastle:bcprov-jdk15on:1.70")
208206
library("bouncycastle-bcpkix-jdk15on", "org.bouncycastle:bcpkix-jdk15on:1.70")
209207
library("hamcrest-hamcrest", "org.hamcrest:hamcrest:2.2")

device-transfer/lib/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dependencies {
1414
testImplementation(testLibs.robolectric.robolectric) {
1515
exclude(group = "com.google.protobuf", module = "protobuf-java")
1616
}
17-
testImplementation(testLibs.robolectric.shadows.multidex)
1817
testImplementation(testLibs.hamcrest.hamcrest)
1918

2019
testImplementation(testFixtures(project(":libsignal-service")))

gradle/verification-metadata.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8979,14 +8979,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
89798979
<sha256 value="126f485b5f1570021ab79a2b819bf44a2f64405bd248f7e819236f13728b9ce7" origin="Generated by Gradle"/>
89808980
</artifact>
89818981
</component>
8982-
<component group="org.robolectric" name="shadows-multidex" version="4.10.3">
8983-
<artifact name="shadows-multidex-4.10.3.jar">
8984-
<sha256 value="34d1da27044528c07ca43c6334af3890868f2570d48114459c25ec4331ea6966" origin="Generated by Gradle"/>
8985-
</artifact>
8986-
<artifact name="shadows-multidex-4.10.3.module">
8987-
<sha256 value="ad1276a3820bbe37672624ee412b14bf35660604fb4802ac9b2ce8de494b72ff" origin="Generated by Gradle"/>
8988-
</artifact>
8989-
</component>
89908982
<component group="org.robolectric" name="utils" version="4.10.3">
89918983
<artifact name="utils-4.10.3.jar">
89928984
<sha256 value="0081b1a65c2c6d7cf56a56f6b4ed85b35a91f5a9f40a4b81c6771b497265518e" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)