@W-18648586: Gradle upgrade (#2727)

JohnsonEricAtSalesforce · web-flow · commit 90e5164d3053 · 2025-06-17T20:35:45.000-06:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.8.2")
+        classpath("com.android.tools.build:gradle:8.10.1")
         classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
         classpath("org.jacoco:org.jacoco.core:0.8.12")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:8.8.2")
+    implementation("com.android.tools.build:gradle:8.10.1")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/hybrid/HybridSampleApps/AccountEditor/build.gradle.kts b/hybrid/HybridSampleApps/AccountEditor/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(project(":libs:SalesforceHybrid"))
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.16.0")
 }
 
 android {
diff --git a/hybrid/HybridSampleApps/MobileSyncExplorerHybrid/build.gradle.kts b/hybrid/HybridSampleApps/MobileSyncExplorerHybrid/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(project(":libs:SalesforceHybrid"))
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.16.0")
 }
 
 android {
diff --git a/libs/MobileSync/build.gradle.kts b/libs/MobileSync/build.gradle.kts
@@ -11,9 +11,9 @@ plugins {
 
 dependencies {
     api(project(":libs:SmartStore"))
-    api("androidx.appcompat:appcompat:1.7.0")
-    api("androidx.appcompat:appcompat-resources:1.7.0")
-    implementation("androidx.core:core-ktx:1.15.0")
+    api("androidx.appcompat:appcompat:1.7.1")
+    api("androidx.appcompat:appcompat-resources:1.7.1")
+    implementation("androidx.core:core-ktx:1.16.0")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
@@ -88,7 +88,7 @@ android {
         }
 
         sourceDirectories.setFrom("${project.projectDir}/src/main/java")
-        val fileFilter = arrayListOf("**/R.class", "**/R\$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
+        val fileFilter = arrayListOf("**/R.class", "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
diff --git a/libs/SalesforceAnalytics/build.gradle.kts b/libs/SalesforceAnalytics/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 dependencies {
     api("com.squareup:tape:1.2.3")
     api("io.github.pilgr:paperdb:2.7.2")
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.16.0")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
@@ -91,7 +91,7 @@ android {
         }
 
         sourceDirectories.setFrom("${project.projectDir}/src/main/java")
-        val fileFilter = arrayListOf("**/R.class", "**/R\$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
+        val fileFilter = arrayListOf("**/R.class", "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
diff --git a/libs/SalesforceHybrid/build.gradle.kts b/libs/SalesforceHybrid/build.gradle.kts
@@ -14,11 +14,11 @@ plugins {
 dependencies {
     api(project(":libs:MobileSync"))
     api("org.apache.cordova:framework:13.0.0")
-    api("androidx.appcompat:appcompat:1.7.0")
-    api("androidx.appcompat:appcompat-resources:1.7.0")
-    api("androidx.webkit:webkit:1.12.1")
+    api("androidx.appcompat:appcompat:1.7.1")
+    api("androidx.appcompat:appcompat-resources:1.7.1")
+    api("androidx.webkit:webkit:1.14.0")
     api("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.16.0")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
@@ -97,7 +97,7 @@ android {
         }
 
         sourceDirectories.setFrom("${project.projectDir}/src/main/java")
-        val fileFilter = arrayListOf("**/R.class", "**/R\$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
+        val fileFilter = arrayListOf("**/R.class", "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
diff --git a/libs/SalesforceReact/build.gradle.kts b/libs/SalesforceReact/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 dependencies {
     api(project(":libs:MobileSync"))
     api("com.facebook.react:react-android:0.79.3")
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.16.0")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
diff --git a/libs/SalesforceSDK/build.gradle.kts b/libs/SalesforceSDK/build.gradle.kts
@@ -11,33 +11,33 @@ plugins {
 }
 
 dependencies {
-    val composeVersion = "1.7.7"
-    val livecycleVersion = "2.8.7"
-    val androidXActivityVersion = "1.10.0"
+    val composeVersion = "1.8.2"
+    val livecycleVersion = "2.8.7" // Update requires Kotlin 2.
+    val androidXActivityVersion = "1.10.1"
 
     api(project(":libs:SalesforceAnalytics"))
     api("com.squareup.okhttp3:okhttp:4.12.0")
-    api("com.google.firebase:firebase-messaging:24.1.0")
-    api("androidx.core:core:1.15.0")
+    api("com.google.firebase:firebase-messaging:24.1.1")
+    api("androidx.core:core:1.16.0")
     api("androidx.browser:browser:1.8.0")
-    api("androidx.work:work-runtime-ktx:2.10.0")
+    api("androidx.work:work-runtime-ktx:2.10.1")
 
     implementation("com.google.android.material:material:1.12.0")  // remove this when all xml is gone
-    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
     implementation("androidx.biometric:biometric:1.2.0-alpha05")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.16.0")
     implementation("androidx.activity:activity-ktx:$androidXActivityVersion")
     implementation("androidx.activity:activity-compose:$androidXActivityVersion")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$livecycleVersion")
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$livecycleVersion")
     implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$livecycleVersion")
     implementation("androidx.lifecycle:lifecycle-service:$livecycleVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
-    implementation("androidx.window:window:1.3.0")
-    implementation("androidx.window:window-core:1.3.0")
-    implementation("androidx.compose.material3:material3-android:1.3.1")
-    implementation(platform("androidx.compose:compose-bom:2025.01.01"))
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") // Update requires Kotlin 2.
+    implementation("androidx.window:window:1.4.0")
+    implementation("androidx.window:window-core:1.4.0")
+    implementation("androidx.compose.material3:material3-android:1.3.2")
+    implementation(platform("androidx.compose:compose-bom:2025.06.00"))
     implementation("androidx.compose.foundation:foundation-android:$composeVersion")
     implementation("androidx.compose.runtime:runtime-livedata:$composeVersion")
     implementation("androidx.compose.ui:ui-tooling-preview-android:$composeVersion")
@@ -114,6 +114,7 @@ android {
         compose = true
     }
 
+    @Suppress("UnstableApiUsage")
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.14"
     }
@@ -130,7 +131,7 @@ android {
         }
 
         sourceDirectories.setFrom("${project.projectDir}/src/main/java")
-        val fileFilter = arrayListOf("**/R.class", "**/R\$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
+        val fileFilter = arrayListOf("**/R.class", "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
diff --git a/libs/SmartStore/build.gradle.kts b/libs/SmartStore/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     //noinspection GradleDependency -  Needs to line up with supported SQLCipher version.
     api("androidx.sqlite:sqlite:2.2.0")
     api("net.zetetic:sqlcipher-android:4.9.0")
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.16.0")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
@@ -94,7 +94,7 @@ android {
         }
 
         sourceDirectories.setFrom("${project.projectDir}/src/main/java")
-        val fileFilter = arrayListOf("**/R.class", "**/R\$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
+        val fileFilter = arrayListOf("**/R.class", "**/R$*.class", "**/BuildConfig.*", "**/Manifest*.*", "**/*Test*.*", "android/**/*.*")
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
diff --git a/native/NativeSampleApps/AppConfigurator/build.gradle.kts b/native/NativeSampleApps/AppConfigurator/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(project(":libs:SalesforceSDK"))
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.core:core-ktx:1.16.0")
 }
 
 android {
diff --git a/native/NativeSampleApps/ConfiguredApp/build.gradle.kts b/native/NativeSampleApps/ConfiguredApp/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 
 dependencies {
     api(project(":libs:SalesforceSDK"))
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.appcompat:appcompat-resources:1.7.0")
-    implementation("androidx.core:core-ktx:1.15.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("androidx.appcompat:appcompat-resources:1.7.1")
+    implementation("androidx.core:core-ktx:1.16.0")
 }
 
 android {
diff --git a/native/NativeSampleApps/RestExplorer/build.gradle.kts b/native/NativeSampleApps/RestExplorer/build.gradle.kts
@@ -5,15 +5,15 @@ plugins {
 
 dependencies {
     implementation(project(":libs:SalesforceSDK"))
-    implementation("androidx.core:core-ktx:1.15.0")
-    implementation("androidx.tracing:tracing:1.2.0")
+    implementation("androidx.core:core-ktx:1.16.0")
+    implementation("androidx.tracing:tracing:1.3.0")
     implementation("com.google.android.material:material:1.12.0")
     androidTestImplementation("androidx.test:runner:1.5.1") {
         exclude("com.android.support", "support-annotations")
     }
 
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.appcompat:appcompat-resources:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("androidx.appcompat:appcompat-resources:1.7.1")
 
     androidTestImplementation("androidx.test:rules:1.5.0") {
         exclude("com.android.support", "support-annotations")

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath("com.android.tools.build:gradle:8.8.2")`
	`12`	`+ classpath("com.android.tools.build:gradle:8.10.1")`
`13`	`13`	`classpath("io.github.gradle-nexus:publish-plugin:1.1.0")`
`14`	`14`	`classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")`
`15`	`15`	`classpath("org.jacoco:org.jacoco.core:0.8.12")`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- implementation("com.android.tools.build:gradle:8.8.2")`
	`10`	`+ implementation("com.android.tools.build:gradle:8.10.1")`
`11`	`11`	`implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")`
`12`	`12`	`implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`
`6`	`6`	`dependencies {`
`7`	`7`	`api(project(":libs:SalesforceHybrid"))`
`8`		`- implementation("androidx.core:core-ktx:1.15.0")`
	`8`	`+ implementation("androidx.core:core-ktx:1.16.0")`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`android {`