Remove Multidex

androidx · Jul 24, 2024 · 71b8c32 · 71b8c32
1 parent e1633ff
commit 71b8c32
Show file tree

Hide file tree

Showing 33 changed files with 1 addition and 76 deletions.
diff --git a/README.md b/README.md
@@ -100,12 +100,6 @@ compileOptions {
 }
 ```
 
-#### 3. Enable multidex
-
-If your Gradle `minSdkVersion` is 20 or lower, you should
-[enable multidex](https://developer.android.com/studio/build/multidex) in order
-to prevent build errors.
-
 ### Locally
 
 Cloning the repository and depending on the modules locally is required when

diff --git a/common_library_config.gradle b/common_library_config.gradle
@@ -27,7 +27,6 @@ android {
         aarMetadata {
             minCompileSdk = project.ext.compileSdkVersion
         }
-        multiDexEnabled true
     }
 
     compileOptions {
@@ -42,7 +41,3 @@ android {
         unitTests.includeAndroidResources true
     }
 }
-
-dependencies {
-    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
-}
diff --git a/constants.gradle b/constants.gradle
@@ -47,7 +47,6 @@ project.ext {
     androidxExifInterfaceVersion = '1.3.6'
     androidxLifecycleVersion = '2.6.0'
     androidxMediaVersion = '1.7.0'
-    androidxMultidexVersion = '2.0.1'
     androidxRecyclerViewVersion = '1.3.0'
     androidxMaterialVersion = '1.8.0'
     androidxTestCoreVersion = '1.5.0'

diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
@@ -29,7 +29,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -62,7 +61,6 @@ dependencies {
     implementation project(modulePrefix + 'lib-ui')
     implementation project(modulePrefix + 'lib-cast')
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
 }

diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:label="@string/application_name"
       android:icon="@mipmap/ic_launcher"
       android:largeHeap="true"

diff --git a/demos/cast/src/main/java/androidx/media3/demo/cast/DemoApplication.java b/demos/cast/src/main/java/androidx/media3/demo/cast/DemoApplication.java
diff --git a/demos/composition/build.gradle b/demos/composition/build.gradle
@@ -31,7 +31,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -58,6 +57,5 @@ dependencies {
     implementation project(modulePrefix + 'lib-transformer')
     implementation project(modulePrefix + 'lib-ui')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
 }
diff --git a/demos/gl/build.gradle b/demos/gl/build.gradle
@@ -29,7 +29,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -55,6 +54,5 @@ dependencies {
     implementation project(modulePrefix + 'lib-exoplayer-smoothstreaming')
     implementation project(modulePrefix + 'lib-ui')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
 }
diff --git a/demos/gl/src/main/AndroidManifest.xml b/demos/gl/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/application_name">

diff --git a/demos/main/build.gradle b/demos/main/build.gradle
@@ -31,7 +31,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -75,7 +74,6 @@ dependencies {
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
     implementation project(modulePrefix + 'lib-exoplayer')
     implementation project(modulePrefix + 'lib-exoplayer-dash')

diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
@@ -40,7 +40,6 @@
       android:largeHeap="true"
       android:allowBackup="false"
       android:supportsRtl="true"
-      android:name="androidx.multidex.MultiDexApplication"
       tools:targetApi="29">
 
     <activity android:name=".SampleChooserActivity"

diff --git a/demos/session/build.gradle b/demos/session/build.gradle
@@ -34,7 +34,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -65,7 +64,6 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-common:' + androidxLifecycleVersion
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:' + androidxLifecycleVersion
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-guava:' + kotlinxCoroutinesVersion
     implementation project(modulePrefix + 'lib-ui')

diff --git a/demos/session/src/main/AndroidManifest.xml b/demos/session/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"

diff --git a/demos/session_automotive/build.gradle b/demos/session_automotive/build.gradle
@@ -34,7 +34,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.automotiveMinSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -60,7 +59,6 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:' + androidxCoreVersion
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
     implementation project(modulePrefix + 'lib-session')
     implementation project(modulePrefix + 'demo-session-service')

diff --git a/demos/session_automotive/src/main/AndroidManifest.xml b/demos/session_automotive/src/main/AndroidManifest.xml
@@ -39,7 +39,6 @@
     android:resource="@xml/automotive_app_desc"/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:taskAffinity=""
       android:appCategory="audio"

diff --git a/demos/session_service/build.gradle b/demos/session_service/build.gradle
@@ -33,7 +33,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -54,7 +53,6 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:' + androidxCoreVersion
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation project(modulePrefix + 'lib-exoplayer')
     implementation project(modulePrefix + 'lib-exoplayer-dash')
     implementation project(modulePrefix + 'lib-exoplayer-hls')

diff --git a/demos/shortform/build.gradle b/demos/shortform/build.gradle
@@ -34,7 +34,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -80,7 +79,6 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:' + androidxCoreVersion
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
     implementation project(modulePrefix + 'lib-exoplayer')
     implementation project(modulePrefix + 'lib-exoplayer-dash')

diff --git a/demos/shortform/src/main/AndroidManifest.xml b/demos/shortform/src/main/AndroidManifest.xml
@@ -21,7 +21,6 @@
     android:allowBackup="false"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
-    android:name="androidx.multidex.MultiDexApplication"
     android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar"
     android:taskAffinity=""
     tools:replace="android:name">

diff --git a/demos/transformer/build.gradle b/demos/transformer/build.gradle
@@ -31,7 +31,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
     }
 
     buildTypes {
@@ -77,7 +76,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
     implementation 'androidx.constraintlayout:constraintlayout:' + androidxConstraintLayoutVersion
     implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
     implementation project(modulePrefix + 'lib-effect')
     implementation project(modulePrefix + 'lib-exoplayer')

diff --git a/libraries/datasource/src/androidTest/AndroidManifest.xml b/libraries/datasource/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:usesCleartextTraffic="true"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">

diff --git a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <uses-sdk/>
 
   <application
-    android:name="androidx.multidex.MultiDexApplication"
     android:allowBackup="false"
     android:usesCleartextTraffic="true"
     tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>

diff --git a/libraries/decoder_flac/src/androidTest/AndroidManifest.xml b/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 

diff --git a/libraries/decoder_opus/src/androidTest/AndroidManifest.xml b/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 

diff --git a/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml b/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 

diff --git a/libraries/exoplayer/src/androidTest/AndroidManifest.xml b/libraries/exoplayer/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true"/>

diff --git a/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml b/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
@@ -24,7 +24,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="androidx.media3.test.utils.HostActivity"

diff --git a/libraries/extractor/src/androidTest/AndroidManifest.xml b/libraries/extractor/src/androidTest/AndroidManifest.xml
@@ -21,7 +21,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true"/>

diff --git a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
@@ -24,7 +24,6 @@
   <uses-sdk/>
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="androidx.media3.test.utils.HostActivity"

diff --git a/libraries/test_session_current/build.gradle b/libraries/test_session_current/build.gradle
@@ -40,7 +40,6 @@ dependencies {
     implementation project(modulePrefix + 'test-session-common')
     implementation project(modulePrefix + 'test-data')
     implementation 'androidx.media:media:' + androidxMediaVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'androidx.test:core:' + androidxTestCoreVersion
     implementation project(modulePrefix + 'test-data')
     androidTestImplementation project(modulePrefix + 'lib-exoplayer')

diff --git a/libraries/test_session_current/src/androidTest/AndroidManifest.xml b/libraries/test_session_current/src/androidTest/AndroidManifest.xml
@@ -19,7 +19,6 @@
   <uses-sdk />
 
   <application
-      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true" >

diff --git a/libraries/test_session_current/src/main/AndroidManifest.xml b/libraries/test_session_current/src/main/AndroidManifest.xml
@@ -24,9 +24,7 @@
     <package android:name="androidx.media3.test.session.test" />
   </queries>
 
-  <application
-      android:name="androidx.multidex.MultiDexApplication"
-      android:allowBackup="false">
+  <application android:allowBackup="false">
     <activity android:name="androidx.media3.test.session.common.SurfaceActivity"
         android:exported="false" />
 

diff --git a/missing_aar_type_workaround.gradle b/missing_aar_type_workaround.gradle
@@ -41,7 +41,6 @@ def addMissingAarTypeToXml(xml) {
         "androidx.leanback:leanback",
         "androidx.media:media",
         "androidx.media2:media2-session",
-        "androidx.multidex:multidex",
         "androidx.recyclerview:recyclerview",
         "androidx.test:core",
         "androidx.test.ext:junit",

diff --git a/testapps/controller/build.gradle b/testapps/controller/build.gradle
@@ -34,7 +34,6 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
-        multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -62,7 +61,6 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:' + androidxCoreVersion
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
     implementation 'androidx.media:media:' + androidxMediaVersion
     implementation project(modulePrefix + 'lib-session')