Remove Multidex

With the minSdk being 21 now, Multidex is not needed anymore.
See https://developer.android.com/build/multidex#mdex-on-l

Author: MGaetan89

catalog/build.gradle

@@ -26,7 +26,6 @@ dependencies {
   api libs.dagger.android.support
   annotationProcessor libs.dagger.android.processor
 
-  api libs.androidx.multidex
   api libs.androidx.constraintlayout
   api libs.androidx.gridlayout
   api libs.androidx.recyclerview
@@ -72,7 +71,6 @@ def srcDirs = [
   'adaptive',
   'application',
   'application/attrs',
-  'application/legacymultidex',
   'application/scope',
   'application/theme',
   'assets',
@@ -133,7 +131,6 @@ android {
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     vectorDrawables.useSupportLibrary = true
-    multiDexEnabled true
     minSdkVersion 21
     targetSdkVersion 33
   }

catalog/java/io/material/catalog/application/CatalogApplication.java

@@ -19,7 +19,6 @@
 import android.app.Application;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import androidx.multidex.MultiDexApplication;
 import androidx.appcompat.app.AppCompatDelegate;
 import android.util.Log;
 import dagger.android.AndroidInjector;
@@ -30,7 +29,7 @@
 import javax.inject.Inject;
 
 /** Catalog application class that provides support for using dispatching Dagger injectors. */
-public class CatalogApplication extends MultiDexApplication implements HasAndroidInjector {
+public class CatalogApplication extends Application implements HasAndroidInjector {
 
   /** Logging tag */
   public static final String TAG = "CatalogApplication";

catalog/java/io/material/catalog/application/legacymultidex/LegacyMultidexCatalogApplication.java

@@ -23,7 +23,6 @@ androidXFragment                     = "1.2.5"
 androidXGridLayout                   = "1.0.0"
 androidXGraphicsShapes               = "1.0.1"
 androidXLifecycle                    = "2.0.0"
-androidXMultidex                     = "2.0.1"
 androidXPreference                   = "1.1.1"
 androidXRecyclerView                 = "1.2.1"
 androidXRecyclerViewSelection        = "1.0.0"
@@ -64,7 +63,6 @@ androidx-dynamicanimation = { group = "androidx.dynamicanimation", name = "dynam
 androidx-fragment = { group = "androidx.fragment", name = "fragment", version.ref = "androidXFragment" }
 androidx-gridlayout = { group = "androidx.gridlayout", name = "gridlayout", version.ref = "androidXGridLayout" }
 androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime", version.ref = "androidXLifecycle" }
-androidx-multidex = { group = "androidx.multidex", name= "multidex", version.ref = "androidXMultidex" }
 androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "androidXPreference" }
 androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidXRecyclerView" }
 androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidXTransition" }

gradle/libs.versions.toml

@@ -22,7 +22,6 @@
     tools:overrideLibrary="androidx.test, android.app, androidx.test.rule, androidx.test.espresso, androidx.test.espresso.idling"/>
 
   <application
-    android:name="androidx.multidex.MultiDexApplication"
     android:supportsRtl="true"
     android:theme="@style/Theme.MaterialComponents.Light">
 

testing/java/com/google/android/material/testapp/AndroidManifest.xml

@@ -18,7 +18,6 @@
   package="com.google.android.material.testapp.animation">
 
   <application
-    android:name="androidx.multidex.MultiDexApplication"
     android:supportsRtl="true"
     android:theme="@style/Theme.Design">
 

testing/java/com/google/android/material/testapp/animation/AndroidManifest.xml

@@ -22,8 +22,6 @@ dependencies {
 
   api project(fromPath("lib"))
   api project(fromPath("testing/java/com/google/android/material/testapp/base"))
-
-  api libs.androidx.multidex
 }
 
 android {
@@ -33,7 +31,6 @@ android {
     main.res.srcDirs = [ 'res' ]
   }
   defaultConfig {
-    multiDexEnabled true
     minSdkVersion 21
     targetSdkVersion 33
   }

testing/java/com/google/android/material/testapp/animation/build.gradle

@@ -1,4 +1,3 @@
-
 apply plugin: 'com.android.application'
 
 dependencies {
@@ -8,14 +7,11 @@ dependencies {
   api project(fromPath("lib"))
   api project(fromPath("testing/java/com/google/android/material/testapp/base"))
   api project(fromPath("testing/java/com/google/android/material/testapp/custom"))
-
-  api libs.androidx.multidex
 }
 
 android {
   namespace "com.google.android.material.testapp"
   defaultConfig {
-    multiDexEnabled true
     minSdkVersion 21
     targetSdkVersion 33
   }

testing/java/com/google/android/material/testapp/build.gradle

@@ -22,7 +22,6 @@
     tools:overrideLibrary="androidx.test, android.app, androidx.test.rule, androidx.test.espresso, androidx.test.espresso.idling"/>
 
   <application
-    android:name="androidx.multidex.MultiDexApplication"
     android:supportsRtl="true"
     android:theme="@style/Theme.MaterialComponents.ViewInflaterTest">
 

testing/java/com/google/android/material/testapp/theme/AndroidManifest.xml

@@ -22,8 +22,6 @@ dependencies {
 
   api project(fromPath("lib"))
   api project(fromPath("testing/java/com/google/android/material/testapp/base"))
-
-  api libs.androidx.multidex
 }
 
 android {
@@ -39,7 +37,6 @@ android {
     main.res.srcDirs = [ 'res' ]
   }
   defaultConfig {
-    multiDexEnabled true
     minSdkVersion 21
     targetSdkVersion 33
   }

testing/java/com/google/android/material/testapp/theme/build.gradle

@@ -29,13 +29,10 @@ dependencies {
   implementation libs.androidx.annotation
   implementation libs.androidx.appcompat
   implementation libs.androidx.core
-
-  api libs.androidx.multidex
 }
 
 android {
   defaultConfig {
-    multiDexEnabled true
     testApplicationId "com.google.android.material.tests"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     minSdkVersion 21