diff --git a/README.md b/README.md
index f67d346b75..feaa550ef4 100644
--- 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
index da66c47e47..c54e686f53 100644
--- 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
index aab5aa5e61..81b8b9f504 100644
--- 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
index de067a5708..a60081ea3a 100644
--- 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
index b6a9b56eac..e852ca39fa 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 6a49adf169..a5c3852faa 100644
--- 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
index da13a42ca4..1a3dff3102 100644
--- 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">
diff --git a/demos/transformer/build.gradle b/demos/transformer/build.gradle
index 63f27f3a78..b0b01c20b2 100644
--- 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
index afcbb337b5..32373d1c2a 100644
--- a/libraries/datasource/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
diff --git a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
index fd7a6dcc79..7da3a987c1 100644
--- a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
diff --git a/libraries/decoder_flac/src/androidTest/AndroidManifest.xml b/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
index d28b481540..1451696625 100644
--- a/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
diff --git a/libraries/decoder_opus/src/androidTest/AndroidManifest.xml b/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
index ab27436543..b6ed01f150 100644
--- a/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
diff --git a/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml b/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
index b22a45dedd..818d5196fc 100644
--- a/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,6 @@
diff --git a/libraries/exoplayer/src/androidTest/AndroidManifest.xml b/libraries/exoplayer/src/androidTest/AndroidManifest.xml
index cee0ce28ad..b1fb1cf643 100644
--- a/libraries/exoplayer/src/androidTest/AndroidManifest.xml
+++ b/libraries/exoplayer/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,6 @@
diff --git a/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml b/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
index 986dce0394..0b0db6b46a 100644
--- a/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
+++ b/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
@@ -24,7 +24,6 @@
diff --git a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
index 2374319ed6..a0d2fd0cfe 100644
--- a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
+++ b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
@@ -24,7 +24,6 @@
diff --git a/libraries/test_session_current/src/main/AndroidManifest.xml b/libraries/test_session_current/src/main/AndroidManifest.xml
index 4cada70076..c6de7e1fed 100644
--- a/libraries/test_session_current/src/main/AndroidManifest.xml
+++ b/libraries/test_session_current/src/main/AndroidManifest.xml
@@ -24,9 +24,7 @@
-
+
diff --git a/missing_aar_type_workaround.gradle b/missing_aar_type_workaround.gradle
index 8d51b28060..be03422e2d 100644
--- 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
index c43453f7ed..680cd90bec 100644
--- 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')