@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x Via RN 0.72.x #2492

JohnsonEricAtSalesforce · 2023-11-15T02:43:45Z

🎸 Ready For Final Review 🥁

Be aware this pull request is one of four related to the React Native 0.72.7, Gradle 8.2 and Android Gradle Plugin 8.2.0 upgrades.
👉🏻 #2492
👉🏻 forcedotcom/SalesforceMobileSDK-CordovaPlugin#631
👉🏻 forcedotcom/SalesforceMobileSDK-ReactNative#345
👉🏻 forcedotcom/SalesforceMobileSDK-Templates#387

This updates MSDK Android to support the React Native 0.72.8, Gradle 8.1 and Android Gradle Plugin 8.2.0 update in the templates repository. It's a complex change since it dovetailed with the recent updates to Android SDK 34 and other dependencies, plus it has to synchronize with three other repositories.

That said, the updates to MSDK are the smaller and most isolated. So this pull request can begin review while I do final self review and tests on the remaining three.

At the moment, I can build every app and pass all tests here in MSDK Android plus create and run all the template apps for Android and iOS. Overall, the changes are pretty close to merge ready, I'd reckon. I'll take one more self-review of the other three repositories and a final run of all the templates just because of the higher risk for regression with three major third-party dependencies updating.

libs/SalesforceReact/build.gradle.kts

settings.gradle.kts

mobilesdk-bot · 2023-11-30T18:05:50Z

	2 Warnings
⚠️	libs/SalesforceSDK/build.gradle.kts#L16 - A newer version of com.google.firebase:firebase-messaging than 23.3.1 is available: 23.4.0
⚠️	libs/SalesforceSDK/build.gradle.kts#L20 - A newer version of com.google.android.material:material than 1.10.0 is available: 1.11.0

Tests results for SalesforceSDK

Generated by 🚫 Danger

…ndroidX Core KTX 1.9.0)

libs/SalesforceAnalytics/build.gradle.kts

libs/SalesforceHybrid/build.gradle.kts

libs/MobileSync/build.gradle.kts

hybrid/HybridSampleApps/AccountEditor/build.gradle.kts

libs/SalesforceReact/build.gradle.kts

libs/SalesforceReact/package.json

brandonpage · 2023-12-05T00:25:01Z

This is looking good!

…ates)

…eact Tests Corrections)

…ndroidX Core KTX 1.12.0)

…Review)

JohnsonEricAtSalesforce · 2023-12-13T01:00:23Z

build.gradle.kts

@@ -9,7 +9,7 @@ buildscript {
    }

    dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.2.0")


A crux change is updating to Android Gradle Plugin 8.2.0, of course.

JohnsonEricAtSalesforce · 2023-12-13T01:03:20Z

buildSrc/build.gradle.kts

    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.22")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.21")


A Kotlin standard library 1.9.21 update comes along with the update to Gradle 8.2 and Android Gradle Plugin 8.2.0. If I recall the testing correctly, this aids downstream in avoiding the template repository's issues in using the new Android core-ktx 1.12.0 version.

JohnsonEricAtSalesforce · 2023-12-13T01:03:38Z

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip


Another crux change: Updating to Gradle 8.2.

JohnsonEricAtSalesforce · 2023-12-13T01:04:40Z

libs/MobileSync/build.gradle.kts

@@ -76,3 +76,7 @@ android {
        aidl = true
    }
 }
+
+kotlin {
+    jvmToolchain(17)


The update to use JVM toolchain was recommended by Gradle, but I only applied it specifically where Gradle suggested it.

JohnsonEricAtSalesforce · 2023-12-13T01:05:21Z

libs/SalesforceHybrid/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
    api("org.apache.cordova:framework:12.0.1")
    api("androidx.appcompat:appcompat:1.6.1")
    api("androidx.appcompat:appcompat-resources:1.6.1")
-    api("androidx.webkit:webkit:1.8.0")
+    api("androidx.webkit:webkit:1.9.0")


This is a rider update, but I thought it applicable since we just did a full update to all dependencies for 12.0.0 on dev.

JohnsonEricAtSalesforce · 2023-12-13T01:07:05Z

libs/SalesforceReact/build.gradle.kts

@@ -23,7 +23,7 @@ plugins {

 dependencies {
    api(project(":libs:MobileSync"))
-    api("com.facebook.react:react-native:0.70.14")
+    api("com.facebook.react:react-android:0.72.7")


This is a specific dependency change from the React Native upgrade helper, as shown in the template repository apps. However, note here a specific version is used since we seem to be unable to apply the React Native Gradle plugin to our library module. If anyone knows of React Native documentation specific to integrating it with non-app modules, let me know since I wasn't able to find it.

JohnsonEricAtSalesforce · 2023-12-13T01:08:37Z

libs/SalesforceReact/build.gradle.kts

@@ -137,12 +137,9 @@ task<Exec>("buildReactTestBundle") {
 }

 task("buildReactTestBundleIfNotExists") {
-    doLast {


This doLast specifically fails in Gradle/AGP 8. Everything does seem to test correctly without it, however. I'd be game to know more if anyone recalls why this was so.

JohnsonEricAtSalesforce · 2023-12-13T01:09:41Z

libs/SalesforceReact/metro.config.js

+const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
+
+/**
+ * Metro configuration for React Native


We do have a start command in this module's package.json, so this new file is required to use that. However, when would we start this React Native module? If that's not used, the command and this file could be removed.

JohnsonEricAtSalesforce · 2023-12-13T01:10:47Z

libs/SalesforceReact/package.json

+  "scripts": {
+    "start": "node node_modules/react-native/local-cli/cli.js start"
+  },
+  "dependencies": {


I used ncu to update the entire dependency list to current specs, which really seemed to help get a consistent configuration when compared to manually updating individual dependencies.

JohnsonEricAtSalesforce · 2023-12-13T01:11:30Z

libs/SalesforceReact/package.json

+    "create-react-class": "^15.7.0",
+    "react": "18.2.0",
+    "react-native": "0.72.7",
+    "react-native-force": "git+https://github.com/JohnsonEricAtSalesforce/SalesforceMobileSDK-ReactNative.git#feature/w-13557285-gradle-8-react-native-0.72.6"


⏳ I am still waiting to update the related repository paths until I do final self review on all four repos.

JohnsonEricAtSalesforce · 2023-12-13T01:12:12Z

.../SalesforceReactTest/src/com/salesforce/androidsdk/reactnative/util/ReactNativeTestHost.java

@@ -42,11 +42,10 @@

 /**
 * Subclass of ReactNativeHost used for testing
- *
+ * <p>


Resolves a cosmetic inspector warning.

JohnsonEricAtSalesforce · 2023-12-13T01:12:17Z

.../SalesforceReactTest/src/com/salesforce/androidsdk/reactnative/util/ReactNativeTestHost.java

 * In addition to the SalesforceReact react packages, it loads SalesforceReactTestPackage (which brings SalesforceTestBridge)
 * It creates an ReactInstanceManager which handles error through NativeModuleCallExceptionTestHandler
 * That way the current test running is marked as failed if any javascript error takes place
- *


Resolves a cosmetic inspector warning.

JohnsonEricAtSalesforce · 2023-12-13T01:12:23Z

.../SalesforceReactTest/src/com/salesforce/androidsdk/reactnative/util/ReactNativeTestHost.java

@@ -65,7 +64,7 @@ public boolean getUseDeveloperSupport() {

    @Override
    protected List<ReactPackage> getPackages() {
-        return Arrays.<ReactPackage>asList(
+        return Arrays.asList(


Resolves a cosmetic inspector warning.

JohnsonEricAtSalesforce · 2023-12-13T01:14:13Z

.../SalesforceReactTest/src/com/salesforce/androidsdk/reactnative/util/ReactNativeTestHost.java

@@ -77,7 +76,6 @@ protected ReactInstanceManager createReactInstanceManager() {
        ReactInstanceManagerBuilder builder = ReactInstanceManager.builder()
                .setApplication(mApplication)
                .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
-                .setUIImplementationProvider(getUIImplementationProvider())


This method no longer exists in RN 0.72.8 and there doesn't seem to be any documentation regarding its replacement.

JohnsonEricAtSalesforce · 2023-12-13T01:15:02Z

settings.gradle.kts

 include("libs:SalesforceAnalytics")
 include("libs:SalesforceSDK")
 include("libs:SmartStore")
 include("libs:MobileSync")
 include("libs:SalesforceHybrid")
-if (hasNodeModules) {


This condition and the variables supporting it are no longer needed since the RN artifacts are being resolved from Maven Central.

JohnsonEricAtSalesforce · 2023-12-13T01:15:51Z

settings.gradle.kts

-        mavenLocal()
-        // All of React Native (JS, Objective-C sources, Android binaries) is installed from NPM.
-        maven("${rootProject.projectDir}/libs/SalesforceReact/node_modules/react-native/android") // For stand-alone MSDK builds.
-        maven("${rootProject.projectDir}/../../node_modules/react-native/android") // For template app builds.
        // Android JSC is installed from NPM.
        maven("${rootProject.projectDir}/libs/SalesforceReact/node_modules/jsc-android/dist") // For stand-alone MSDK builds.


We do need the JSC local Maven repository still based on on a few tests I tried.

…roid.defaults.buildfeatures.buildconfig Deprecation)

…per 8.2 Update)

…ault Github Repository References)

mobilesdk-bot · 2023-12-14T01:38:27Z

	1 Warning
⚠️	libs/SmartStore/build.gradle.kts#L23 - A newer version of com.google.android.material:material than 1.10.0 is available: 1.11.0

Tests results for SmartStore

Generated by 🚫 Danger

wmathurin reviewed Nov 15, 2023

View reviewed changes

libs/SalesforceReact/build.gradle.kts Outdated Show resolved Hide resolved

JohnsonEricAtSalesforce changed the title ~~@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x~~ @W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x Via RN 0.72.x Nov 16, 2023

JohnsonEricAtSalesforce commented Nov 30, 2023

View reviewed changes

settings.gradle.kts Show resolved Hide resolved

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x

b82742e

JohnsonEricAtSalesforce force-pushed the feature/w-13557285-gradle-8-react-native-0.72.6 branch from a83d12b to b82742e Compare November 30, 2023 17:53

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x (Revert To A…

cd83bc0

…ndroidX Core KTX 1.9.0)

mobilesdk-bot reviewed Dec 1, 2023

View reviewed changes

libs/SalesforceAnalytics/build.gradle.kts Outdated Show resolved Hide resolved

mobilesdk-bot reviewed Dec 1, 2023

View reviewed changes

libs/SalesforceHybrid/build.gradle.kts Outdated Show resolved Hide resolved

mobilesdk-bot reviewed Dec 1, 2023

View reviewed changes

libs/MobileSync/build.gradle.kts Outdated Show resolved Hide resolved

wmathurin requested changes Dec 1, 2023

View reviewed changes

hybrid/HybridSampleApps/AccountEditor/build.gradle.kts Outdated Show resolved Hide resolved

libs/SalesforceReact/build.gradle.kts Outdated Show resolved Hide resolved

JohnsonEricAtSalesforce force-pushed the feature/w-13557285-gradle-8-react-native-0.72.6 branch from 1209a28 to ff75ebe Compare December 5, 2023 00:06

brandonpage reviewed Dec 5, 2023

View reviewed changes

libs/SalesforceReact/package.json Outdated Show resolved Hide resolved

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x (General Upd…

661d738

…ates)

JohnsonEricAtSalesforce force-pushed the feature/w-13557285-gradle-8-react-native-0.72.6 branch 7 times, most recently from f7aa2e6 to ad778f3 Compare December 6, 2023 21:31

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x (SalesforceR…

ffbf86c

…eact Tests Corrections)

JohnsonEricAtSalesforce force-pushed the feature/w-13557285-gradle-8-react-native-0.72.6 branch from ad778f3 to ffbf86c Compare December 11, 2023 22:29

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x (Update To A…

35d757a

…ndroidX Core KTX 1.12.0)

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x (Final Self-…

3d36c19

…Review)

JohnsonEricAtSalesforce commented Dec 13, 2023

View reviewed changes

JohnsonEricAtSalesforce marked this pull request as ready for review December 13, 2023 01:16

JohnsonEricAtSalesforce requested review from brandonpage, wmathurin and mobilesdk-bot December 13, 2023 01:16

wmathurin approved these changes Dec 13, 2023

View reviewed changes

brandonpage approved these changes Dec 13, 2023

View reviewed changes

JohnsonEricAtSalesforce added 3 commits December 13, 2023 18:06

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x (Resolve and…

23dcd03

…roid.defaults.buildfeatures.buildconfig Deprecation)

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x (Gradle Wrap…

3a1ae15

…per 8.2 Update)

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x (Restore Def…

f752487

…ault Github Repository References)

JohnsonEricAtSalesforce force-pushed the feature/w-13557285-gradle-8-react-native-0.72.6 branch from 5c5ecd9 to f752487 Compare December 14, 2023 01:26

JohnsonEricAtSalesforce merged commit 51e8681 into forcedotcom:dev Dec 15, 2023
11 checks passed

JohnsonEricAtSalesforce deleted the feature/w-13557285-gradle-8-react-native-0.72.6 branch December 15, 2023 20:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x Via RN 0.72.x #2492

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x Via RN 0.72.x #2492

JohnsonEricAtSalesforce commented Nov 15, 2023 •

edited

mobilesdk-bot commented Nov 30, 2023 •

edited

brandonpage commented Dec 5, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

JohnsonEricAtSalesforce Dec 13, 2023

mobilesdk-bot commented Dec 14, 2023

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x Via RN 0.72.x #2492

@W-13557285: [Android] Upgrade to Gradle 8.x and AGP 8.x Via RN 0.72.x #2492

Conversation

JohnsonEricAtSalesforce commented Nov 15, 2023 • edited

mobilesdk-bot commented Nov 30, 2023 • edited

Tests results for SalesforceSDK

brandonpage commented Dec 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mobilesdk-bot commented Dec 14, 2023

Tests results for SmartStore

JohnsonEricAtSalesforce commented Nov 15, 2023 •

edited

mobilesdk-bot commented Nov 30, 2023 •

edited