Mobile SDK 12.1.1

wmathurin · wmathurin · commit 7c88950ef8a3 · 2024-08-29T10:42:56.000-07:00
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ This pulls submodule dependencies from github.
 Introduction
 ==
 
-### What's New in 12.2.0
+### What's New in 12.1.1
 See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
 
 ### Native Applications
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,7 +18,7 @@ buildscript {
 
 allprojects {
     group = "com.salesforce.mobilesdk"
-    version = "12.2.0"
+    version = "12.1.1"
 
     // 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/external/shared b/external/shared
@@ -1 +1 @@
-Subproject commit 603a4305b25e7552b97965a7ed58dd2623c709ea
+Subproject commit 4cd367677741c6355904bf2a9a001b5688027aed
diff --git a/libs/MobileSync/AndroidManifest.xml b/libs/MobileSync/AndroidManifest.xml
@@ -2,7 +2,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="86"
-    android:versionName="12.2.0.dev">
+    android:versionName="12.1.1">
 
     <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.2.0"
+rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
 rootProject.ext["PUBLISH_ARTIFACT_ID"] = "MobileSync"
 
 plugins {
diff --git a/libs/SalesforceAnalytics/AndroidManifest.xml b/libs/SalesforceAnalytics/AndroidManifest.xml
@@ -2,7 +2,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	android:versionCode="86"
-	android:versionName="12.2.0.dev">
+	android:versionName="12.1.1">
 
 	<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.2.0"
+rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
 rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceAnalytics"
 
 plugins {
diff --git a/libs/SalesforceHybrid/AndroidManifest.xml b/libs/SalesforceHybrid/AndroidManifest.xml
@@ -2,7 +2,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="86"
-    android:versionName="12.2.0.dev">
+    android:versionName="12.1.1">
 
     <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.2.0"
+rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
 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.2.0">
+    version   = "12.1.1">
 
     <content src="index.html" />
 
diff --git a/libs/SalesforceReact/AndroidManifest.xml b/libs/SalesforceReact/AndroidManifest.xml
@@ -2,7 +2,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="86"
-    android:versionName="12.2.0.dev">
+    android:versionName="12.1.1">
     
     <application>
         <activity android:name=".ui.SalesforceReactActivity"
diff --git a/libs/SalesforceReact/build.gradle.kts b/libs/SalesforceReact/build.gradle.kts
@@ -12,7 +12,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 val useIntlJsc = false
 
 rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
-rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
+rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
 rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceReact"
 
 plugins {
diff --git a/libs/SalesforceReact/package.json b/libs/SalesforceReact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SalesforceReact",
-  "version": "12.2.0",
+  "version": "12.1.1",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start"
@@ -10,7 +10,7 @@
     "create-react-class": "^15.7.0",
     "react": "18.2.0",
     "react-native": "0.74.3",
-    "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#dev"
+    "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#v12.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
diff --git a/libs/SalesforceSDK/AndroidManifest.xml b/libs/SalesforceSDK/AndroidManifest.xml
@@ -3,7 +3,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
 	android:versionCode="86"
-	android:versionName="12.2.0.dev">
+	android:versionName="12.1.1">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/libs/SalesforceSDK/build.gradle.kts b/libs/SalesforceSDK/build.gradle.kts
@@ -1,7 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
-rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
+rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
 rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceSDK"
 
 plugins {
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
@@ -1514,7 +1514,7 @@ open class SalesforceSDKManager protected constructor(
         protected var INSTANCE: SalesforceSDKManager? = null
 
         /** The current version of this SDK */
-        const val SDK_VERSION = "12.2.0.dev"
+        const val SDK_VERSION = "12.1.1"
 
         /**
          * An intent action meant for instances of Salesforce SDK manager
diff --git a/libs/SmartStore/AndroidManifest.xml b/libs/SmartStore/AndroidManifest.xml
@@ -2,7 +2,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	android:versionCode="86"
-	android:versionName="12.2.0.dev">
+	android:versionName="12.1.1">
 
 	<application>
 
diff --git a/libs/SmartStore/build.gradle.kts b/libs/SmartStore/build.gradle.kts
@@ -1,7 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
-rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
+rootProject.ext["PUBLISH_VERSION"] = "12.1.1"
 rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SmartStore"
 
 plugins {
diff --git a/libs/test/SalesforceHybridTest/res/xml/config.xml b/libs/test/SalesforceHybridTest/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.2.0">
+    version   = "12.1.1">
 
     <content src="index.html" />
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SalesforceMobileSDK-Android",
-  "version": "12.2.0",
+  "version": "12.1.1",
   "description": "Salesforce Mobile SDK for Android",
   "keywords": [
     "mobilesdk",
diff --git a/tools/generate_doc.sh b/tools/generate_doc.sh
@@ -3,5 +3,5 @@ if [ ! -d "external" ]
 then
     echo "You must run this tool from the root directory of your repo clone"
 else
-    javadoc -d doc -author -version -verbose -use -doctitle "SalesforceSDK 12.2 API" -sourcepath "libs/SalesforceAnalytics/src:libs/SalesforceSDK/src:libs/SmartStore/src:libs/MobileSync/src:libs/SalesforceHybrid/src:libs/SalesforceReact/src" -subpackages com
+    javadoc -d doc -author -version -verbose -use -doctitle "SalesforceSDK 12.1 API" -sourcepath "libs/SalesforceAnalytics/src:libs/SalesforceSDK/src:libs/SmartStore/src:libs/MobileSync/src:libs/SalesforceHybrid/src:libs/SalesforceReact/src" -subpackages com
 fi
