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 signalapp#13378
benarmstead · Feb 1, 2024 · c93b490 · c93b490
1 parent 67d3c8e
commit c93b490
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git 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
@@ -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
@@ -2590,9 +2590,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="fe565bb22b04c8538d8696e9f773b36c7e0190fe826f29ccc158bafeca618630" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.davemorrissey.labs" name="subsampling-scale-image-view" version="3.10.0">
-         <artifact name="subsampling-scale-image-view-3.10.0.aar">
-            <sha256 value="c76e3d9796cd16ce9894063ea8c53be6903c7df4081f8adca63a6ac1651a019d" origin="Generated by Gradle"/>
+      <component group="com.davemorrissey.labs" name="subsampling-scale-image-view-androidx" version="3.10.0">
+         <artifact name="subsampling-scale-image-view-androidx-3.10.0.aar">
+            <sha256 value="4ada2257a68615029ee5372dcfc9d400fb945434ccf68da6ef8c9b01a4022d13" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.12.0">
@@ -3526,9 +3526,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5e36d1137a3e96498c8b67b219ab177c33fe93dcf52a6cda6c2659acc405aa19" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.pnikosis" name="materialish-progress" version="1.5">
-         <artifact name="materialish-progress-1.5.aar">
-            <sha256 value="d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54" origin="Generated by Gradle"/>
+      <component group="com.pnikosis" name="materialish-progress" version="1.7">
+         <artifact name="materialish-progress-1.7.aar">
+            <sha256 value="da089a90d1dab61e9b50038c09081019398f81190d12b0b567ce94b83ef8cf93" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.squareup" name="javapoet" version="1.10.0">