From c93b4909f4720def184bbaef087ecffdbcbbb8a8 Mon Sep 17 00:00:00 2001 From: Jameson Williams Date: Mon, 22 Jan 2024 22:03:07 -0600 Subject: [PATCH] Remove Jetifier from build. materialish-progress and subsampling-scale-image-view were bringing in Android Support libraries as transitive dependencies. This required Jetifier to be run as part of the build. More recent versions of these dependencies have been released, which now use AndroidX directly. By upgrading these dependencies, Jetifier is no longer needed to build Signal. Resolves #13378 --- dependencies.gradle.kts | 4 ++-- gradle.properties | 1 - gradle/verification-metadata.xml | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts index 2bd86af077..a97d3f61c4 100644 --- a/dependencies.gradle.kts +++ b/dependencies.gradle.kts @@ -140,8 +140,8 @@ dependencyResolutionManagement { library("glide-glide", "com.github.bumptech.glide", "glide").versionRef("glide") library("glide-compiler", "com.github.bumptech.glide", "compiler").versionRef("glide") library("roundedimageview", "com.makeramen:roundedimageview:2.1.0") - library("materialish-progress", "com.pnikosis:materialish-progress:1.5") - library("subsampling-scale-image-view", "com.davemorrissey.labs:subsampling-scale-image-view:3.10.0") + library("materialish-progress", "com.pnikosis:materialish-progress:1.7") + library("subsampling-scale-image-view", "com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0") library("android-tooltips", "com.tomergoldst.android:tooltips:1.0.6") library("android-smsmms", "com.klinkerapps:android-smsmms:4.0.1") library("stream", "com.annimon:stream:1.1.8") diff --git a/gradle.properties b/gradle.properties index d7cb0fccbd..42591f21c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-Xmx6g -Xms256m -XX:MaxMetaspaceSize=1g android.useAndroidX=true -android.enableJetifier=true kapt.incremental.apt=false android.experimental.androidTest.numManagedDeviceShards=4 android.defaults.buildfeatures.buildconfig=true diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index ef210f85ca..d61dbbd819 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2590,9 +2590,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -3526,9 +3526,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + +