diff --git a/catalog/build.gradle b/catalog/build.gradle index c87f2a90c3d..54984b59d87 100644 --- a/catalog/build.gradle +++ b/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 } diff --git a/catalog/java/io/material/catalog/application/CatalogApplication.java b/catalog/java/io/material/catalog/application/CatalogApplication.java index a24db7d2712..e730607d109 100644 --- a/catalog/java/io/material/catalog/application/CatalogApplication.java +++ b/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"; diff --git a/catalog/java/io/material/catalog/application/legacymultidex/LegacyMultidexCatalogApplication.java b/catalog/java/io/material/catalog/application/legacymultidex/LegacyMultidexCatalogApplication.java deleted file mode 100644 index cb56bf812bd..00000000000 --- a/catalog/java/io/material/catalog/application/legacymultidex/LegacyMultidexCatalogApplication.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.material.catalog.application.legacymultidex; - -import android.content.Context; -import androidx.multidex.MultiDex; -import io.material.catalog.application.CatalogApplication; - -/** - * A version of {@link CatalogApplication} for development builds on older phones that uses the - * multidex support library for allowing multiple dex files. - */ -public class LegacyMultidexCatalogApplication extends CatalogApplication { - @Override - protected void attachBaseContext(Context base) { - super.attachBaseContext(base); - MultiDex.install(this); - } -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 21e1b6d544e..8dbf87b9f0b 100644 --- a/gradle/libs.versions.toml +++ b/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" } diff --git a/lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java b/lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java index 8dfb3837b83..79ac6583bed 100644 --- a/lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java +++ b/lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java @@ -28,7 +28,6 @@ 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; @@ -36,7 +35,6 @@ 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 capturedSharedElement; diff --git a/lib/javatests/com/google/android/material/internal/StaticLayoutBuilderCompatTest.java b/lib/javatests/com/google/android/material/internal/StaticLayoutBuilderCompatTest.java index b11c6e73372..d68f66d7611 100644 --- a/lib/javatests/com/google/android/material/internal/StaticLayoutBuilderCompatTest.java +++ b/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; diff --git a/lib/javatests/com/google/android/material/motion/MotionUtilsTest.java b/lib/javatests/com/google/android/material/motion/MotionUtilsTest.java index 7bf03bd1284..fba77af6e6f 100644 --- a/lib/javatests/com/google/android/material/motion/MotionUtilsTest.java +++ b/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 activityController; diff --git a/lib/javatests/com/google/android/material/sidesheet/res/layout/test_coplanar_side_sheet.xml b/lib/javatests/com/google/android/material/sidesheet/res/layout/test_coplanar_side_sheet.xml index a0375f3ab14..7eac4a3c7fe 100644 --- a/lib/javatests/com/google/android/material/sidesheet/res/layout/test_coplanar_side_sheet.xml +++ b/lib/javatests/com/google/android/material/sidesheet/res/layout/test_coplanar_side_sheet.xml @@ -16,7 +16,6 @@ --> + app:layout_behavior="@string/side_sheet_behavior"> + app:layout_behavior="@string/side_sheet_behavior"> diff --git a/testing/java/com/google/android/material/testapp/animation/AndroidManifest.xml b/testing/java/com/google/android/material/testapp/animation/AndroidManifest.xml index 377db12ce0b..30acdf03952 100644 --- a/testing/java/com/google/android/material/testapp/animation/AndroidManifest.xml +++ b/testing/java/com/google/android/material/testapp/animation/AndroidManifest.xml @@ -18,7 +18,6 @@ package="com.google.android.material.testapp.animation"> diff --git a/testing/java/com/google/android/material/testapp/animation/build.gradle b/testing/java/com/google/android/material/testapp/animation/build.gradle index 1880df59cdd..c4d69446e73 100644 --- a/testing/java/com/google/android/material/testapp/animation/build.gradle +++ b/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 } diff --git a/testing/java/com/google/android/material/testapp/build.gradle b/testing/java/com/google/android/material/testapp/build.gradle index be7e5e3af27..a45cb8d6524 100644 --- a/testing/java/com/google/android/material/testapp/build.gradle +++ b/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 } diff --git a/testing/java/com/google/android/material/testapp/res/values/styles.xml b/testing/java/com/google/android/material/testapp/res/values/styles.xml index cb6dfe72aae..643d814fa47 100644 --- a/testing/java/com/google/android/material/testapp/res/values/styles.xml +++ b/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. --> - + diff --git a/testing/java/com/google/android/material/testapp/theme/AndroidManifest.xml b/testing/java/com/google/android/material/testapp/theme/AndroidManifest.xml index 1713b366fb3..dda5b1f48c3 100644 --- a/testing/java/com/google/android/material/testapp/theme/AndroidManifest.xml +++ b/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"/> diff --git a/testing/java/com/google/android/material/testapp/theme/build.gradle b/testing/java/com/google/android/material/testapp/theme/build.gradle index c8cad724b58..3401c90d234 100644 --- a/testing/java/com/google/android/material/testapp/theme/build.gradle +++ b/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 } diff --git a/tests/javatests/com/google/android/material/theme/build.gradle b/tests/javatests/com/google/android/material/theme/build.gradle index b36c0412949..1aa2e8770cb 100644 --- a/tests/javatests/com/google/android/material/theme/build.gradle +++ b/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