Merging dev into master

forcedotcom · Oct 28, 2024 · 96b1701 · 96b1701
2 parents 7c88950 + fbc26b4
commit 96b1701
Show file tree

Hide file tree

Showing 76 changed files with 3,799 additions and 3,235 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -118,9 +118,10 @@ jobs:
       - restore_cache: *restore-node-cache
       - restore_cache: *restore-ruby-cache
       - run: *setup-env
-      - run:
-          name: Static Analysis
-          command: ./gradlew libs:<< parameters.lib >>:lint
+# XXX commented out because gradle build daemon keep disappears for some of the libs
+#      - run:
+#          name: Static Analysis
+#          command: ./gradlew libs:<< parameters.lib >>:lint
       - run:
           name: Build for Testing
           command: |

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ This pulls submodule dependencies from github.
 Introduction
 ==
 
-### What's New in 12.1.1
+### What's New in 12.2.0
 See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
 
 ### Native Applications

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.5.0")
+        classpath("com.android.tools.build:gradle:8.6.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")
@@ -18,7 +18,7 @@ buildscript {
 
 allprojects {
     group = "com.salesforce.mobilesdk"
-    version = "12.1.1"
+    version = "12.2.0"
 
     // Ensure that we do not use newer language features that would make the SDK incompatible with
     // apps that do not target the latest version of Kotlin.

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.5.0")
+    implementation("com.android.tools.build:gradle:8.6.1")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")
 }
diff --git a/external/shared b/external/shared
diff --git a/hybrid/HybridSampleApps/AccountEditor/AndroidManifest.xml b/hybrid/HybridSampleApps/AccountEditor/AndroidManifest.xml
@@ -46,7 +46,7 @@
         <!--
         <activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:theme="@style/SalesforceSDK"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
             android:exported="true">
 
             <intent-filter>

diff --git a/hybrid/HybridSampleApps/MobileSyncExplorerHybrid/AndroidManifest.xml b/hybrid/HybridSampleApps/MobileSyncExplorerHybrid/AndroidManifest.xml
@@ -47,7 +47,7 @@
         <!--
         <activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:theme="@style/SalesforceSDK"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
             android:exported="true">
 
             <intent-filter>

diff --git a/libs/MobileSync/AndroidManifest.xml b/libs/MobileSync/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="86"
-    android:versionName="12.1.1">
+    android:versionCode="87"
+    android:versionName="12.2.0.dev">
 
     <application />
 

diff --git a/libs/MobileSync/build.gradle.kts b/libs/MobileSync/build.gradle.kts
@@ -1,7 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
-rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
+rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
 rootProject.ext["PUBLISH_ARTIFACT_ID"] = "MobileSync"
 
 plugins {

diff --git a/libs/SalesforceAnalytics/AndroidManifest.xml b/libs/SalesforceAnalytics/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	android:versionCode="86"
-	android:versionName="12.1.1">
+	android:versionCode="87"
+	android:versionName="12.2.0.dev">
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/libs/SalesforceAnalytics/build.gradle.kts b/libs/SalesforceAnalytics/build.gradle.kts
@@ -1,7 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
-rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
+rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
 rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceAnalytics"
 
 plugins {

diff --git a/libs/SalesforceHybrid/AndroidManifest.xml b/libs/SalesforceHybrid/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="86"
-    android:versionName="12.1.1">
+    android:versionCode="87"
+    android:versionName="12.2.0.dev">
 
     <application>
         <activity android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"

diff --git a/libs/SalesforceHybrid/build.gradle.kts b/libs/SalesforceHybrid/build.gradle.kts
@@ -1,7 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
-rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
+rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
 rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceHybrid"
 
 plugins {

diff --git a/libs/SalesforceHybrid/res/xml/config.xml b/libs/SalesforceHybrid/res/xml/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <widget xmlns     = "http://www.w3.org/ns/widgets"
     id        = "com.salesforce.androidsdk"
-    version   = "12.1.1">
+    version   = "12.2.0">
 
     <content src="index.html" />
+1 −1		gen/cordova_plugins.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.plugin.mobilesync.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.plugin.network.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.plugin.oauth.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.plugin.sdkinfo.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.plugin.sfaccountmanager.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.plugin.smartstore.client.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.plugin.smartstore.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.util.bootstrap.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.util.event.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.util.exec.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.util.logger.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.util.promiser.js
+1 −1		gen/plugins/com.salesforce/com.salesforce.util.push.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.plugin.mobilesync.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.plugin.network.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.plugin.oauth.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.plugin.sdkinfo.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.plugin.sfaccountmanager.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartstore.client.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartstore.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.util.bootstrap.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.util.event.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.util.exec.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.util.logger.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.util.promiser.js
+1 −1		gen/plugins_with_define/com.salesforce/com.salesforce.util.push.js
+1 −1		libs/cordova.force.js
+1 −1		package.json
+1 −1		test/MockSDKInfo.js
+1 −1		test/SFSDKInfoTestSuite.js
+1 −1		test/SFTestRunnerPlugin.js
+1 −1		tools/bower.json
+1 −1		tools/package.json