From a4a8dd9d8199c213481680c72f8fb1b68c1ee269 Mon Sep 17 00:00:00 2001 From: Sam Judd Date: Sat, 1 Jul 2023 17:12:16 -0700 Subject: [PATCH] Remove jetifier from Glide. --- gradle.properties | 1 - instrumentation/build.gradle | 2 +- settings.gradle | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index fe3862769c..f57f03b6c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,6 @@ POM_SCM_URL=https\://github.com/bumptech/glide POM_URL=https\://github.com/bumptech/glide ## Gradle config -android.enableJetifier=true android.useAndroidX=true org.gradle.configureondemand=false org.gradle.daemon=true diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle index e9d692a3e8..f884cd9c8c 100644 --- a/instrumentation/build.gradle +++ b/instrumentation/build.gradle @@ -8,7 +8,7 @@ apply plugin: 'com.android.application' dependencies { annotationProcessor project(":annotation:compiler") implementation project(":library") - implementation libs.android.support.multidex + implementation libs.androidx.multidex implementation libs.androidx.appcompat androidTestImplementation project(':library') diff --git a/settings.gradle b/settings.gradle index a7528e0ef2..7c841a90cb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -66,7 +66,7 @@ dependencyResolutionManagement { // currently use, so we're stuck on an older version. version('androidx-fragment', '1.3.6') - library('android.support.multidex', "com.android.support:multidex:1.0.3") + library('androidx-multidex', "androidx.multidex:multidex:2.0.1") library('autoservice', 'com.google.auto.service:auto-service:1.0-rc3') library('autoservice.annotations', 'com.google.auto.service:auto-service-annotations:1.0.1') library('android-gradle', 'com.android.tools.build:gradle:7.3.0')