Merge pull request #2766 from wordpress-mobile/build/enable-non-trans…

…itive-resources [Build] Enable Non-Transitive Resources
wordpress-mobile · Jul 10, 2023 · 7e1adbc · 7e1adbc
2 parents 5eeeff6 + e2ae59c
commit 7e1adbc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.configure-files/gradle.properties.enc b/.configure-files/gradle.properties.enc
diff --git a/gradle.properties-example b/gradle.properties-example
@@ -1,4 +1,10 @@
+# Project-wide Gradle settings.
+
 org.gradle.jvmargs=-Xmx6G -XX:+HeapDumpOnOutOfMemoryError
+
+# WordPress-Flux-Android properties.
+
 android.useAndroidX=true
-android.enableJetifier=true
-android.jetifier.ignorelist=bcprov
+android.enableJetifier=false
+
+android.nonTransitiveRClass=true
diff --git a/settings.gradle b/settings.gradle
@@ -21,7 +21,7 @@ plugins {
     id 'com.gradle.enterprise' version '3.9'
 }
 
-def catalogVersion = "1.10.0"
+def catalogVersion = "1.11.0"
 dependencyResolutionManagement {
     repositories {
         exclusiveContent {