[Catalog] Remove Multidex

catalog/build.gradle

@@ -12,7 +12,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
@@ -53,7 +52,6 @@ def srcDirs = [
   'adaptive',
   'application',
   'application/attrs',
-  'application/legacymultidex',
   'application/scope',
   'application/theme',
   'assets',
@@ -113,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";

gradle/libs.versions.toml

@@ -19,7 +19,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"
@@ -56,7 +55,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" }

lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java

@@ -28,15 +28,13 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION_CODES;
 import android.os.Parcelable;
 import android.transition.Transition;
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.Window;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import com.google.android.material.internal.ContextUtils;
@@ -49,7 +47,6 @@
 /**
  * A {@link SharedElementCallback} to be used for {@link MaterialContainerTransform} transitions.
  */
-@RequiresApi(VERSION_CODES.LOLLIPOP)
 public class MaterialContainerTransformSharedElementCallback extends SharedElementCallback {
 
   @Nullable private static WeakReference<View> capturedSharedElement;

lib/javatests/com/google/android/material/internal/StaticLayoutBuilderCompatTest.java

@@ -16,7 +16,6 @@
 
 package com.google.android.material.internal;
 
-import static android.os.Build.VERSION_CODES.LOLLIPOP;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Build.VERSION_CODES;
@@ -40,7 +39,7 @@ public class StaticLayoutBuilderCompatTest {
           + "Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, "
           + "vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a";
 
-  @Config(minSdk = LOLLIPOP, maxSdk = VERSION_CODES.P)
+  @Config(maxSdk = VERSION_CODES.P)
   @Test
   public void createStaticLayout_withMaxLines_LongString() throws Exception {
     int maxLines = 3;

lib/javatests/com/google/android/material/motion/MotionUtilsTest.java

@@ -30,7 +30,6 @@
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.PathInterpolator;
-import androidx.annotation.RequiresApi;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.dynamicanimation.animation.SpringForce;
 import androidx.test.core.app.ApplicationProvider;
@@ -48,7 +47,6 @@
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = VERSION_CODES.LOLLIPOP)
 @DoNotInstrument
-@RequiresApi(api = VERSION_CODES.LOLLIPOP)
 public class MotionUtilsTest {
 
   private ActivityController<AppCompatActivity> activityController;

lib/javatests/com/google/android/material/sidesheet/res/layout/test_coplanar_side_sheet.xml

@@ -16,7 +16,6 @@
   -->
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/test_coordinator_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -38,8 +37,7 @@
     android:layout_width="256dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    app:layout_behavior="@string/side_sheet_behavior"
-    tools:targetApi="lollipop">
+    app:layout_behavior="@string/side_sheet_behavior">
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="match_parent"

lib/javatests/com/google/android/material/sidesheet/res/layout/test_side_sheet.xml

@@ -16,7 +16,6 @@
   -->
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/test_coordinator_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -28,8 +27,7 @@
     android:layout_width="256dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    app:layout_behavior="@string/side_sheet_behavior"
-    tools:targetApi="lollipop">
+    app:layout_behavior="@string/side_sheet_behavior">
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="match_parent"

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

@@ -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/animation/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/build.gradle

@@ -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/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/res/values/styles.xml

@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
   <style name="TextSmallStyle" parent="@android:style/TextAppearance">
     <item name="android:textSize">@dimen/text_small_size</item>
@@ -28,15 +28,13 @@
   </style>
 
   <style name="Theme.TranslucentStatus"
-    parent="Theme.AppCompat.Light.NoActionBar"
-    tools:targetApi="lollipop">
+    parent="Theme.AppCompat.Light.NoActionBar">
     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     <item name="android:statusBarColor">@android:color/transparent</item>
   </style>
 
   <style name="Theme.TranslucentNavBar"
-    parent="Theme.AppCompat.Light.NoActionBar"
-    tools:targetApi="lollipop">
+    parent="Theme.AppCompat.Light.NoActionBar">
     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
   </style>
 

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

@@ -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/build.gradle

@@ -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
   }

tests/javatests/com/google/android/material/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