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

@@ -12,10 +12,8 @@ dependencies {
   api 'com.google.dagger:dagger-android-support:2.51.1'
   annotationProcessor 'com.google.dagger:dagger-android-processor:2.51.1'
 
-  api 'androidx.multidex:multidex:2.0.1'
   api 'androidx.constraintlayout:constraintlayout:2.1.0'
   api 'androidx.gridlayout:gridlayout:1.0.0'
-  api "androidx.multidex:multidex:2.0.1"
   api "androidx.recyclerview:recyclerview:1.2.1"
   api 'androidx.window:window:1.0.0-beta04'
   api "androidx.window:window-java:1.0.0-beta04"
@@ -54,7 +52,6 @@ def srcDirs = [
   'adaptive',
   'application',
   'application/attrs',
-  'application/legacymultidex',
   'application/scope',
   'application/theme',
   'assets',
@@ -114,7 +111,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

@@ -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 'androidx.multidex:multidex:2.0.1'
 }
 
 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

@@ -8,14 +8,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 'androidx.multidex:multidex:2.0.1'
 }
 
 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

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