From 44d4596b90f3600ee8e3e9a6a64f78895c9096cf Mon Sep 17 00:00:00 2001 From: Wolfgang Mathurin Date: Thu, 31 Aug 2023 10:34:19 -0700 Subject: [PATCH] Mobile SDK 11.0.1 --- README.md | 2 +- build.gradle | 2 +- external/shared | 2 +- libs/MobileSync/AndroidManifest.xml | 2 +- libs/MobileSync/build.gradle | 2 +- libs/SalesforceAnalytics/AndroidManifest.xml | 2 +- libs/SalesforceAnalytics/build.gradle | 2 +- libs/SalesforceHybrid/AndroidManifest.xml | 2 +- libs/SalesforceHybrid/build.gradle | 2 +- libs/SalesforceHybrid/res/xml/config.xml | 2 +- libs/SalesforceReact/AndroidManifest.xml | 2 +- libs/SalesforceReact/build.gradle | 2 +- libs/SalesforceReact/package.json | 4 ++-- libs/SalesforceSDK/AndroidManifest.xml | 2 +- libs/SalesforceSDK/build.gradle | 2 +- .../com/salesforce/androidsdk/app/SalesforceSDKManager.java | 2 +- libs/SmartStore/AndroidManifest.xml | 2 +- libs/SmartStore/build.gradle | 2 +- libs/test/SalesforceHybridTest/res/xml/config.xml | 2 +- package.json | 2 +- tools/generate_doc.sh | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 381c313c8d..18db86f9c9 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This pulls submodule dependencies from github. Introduction == -### What's New in 11.1.0 +### What's New in 11.0.1 See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases). ### Native Applications diff --git a/build.gradle b/build.gradle index 0943d9b3aa..7e7f0c7e1c 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { allprojects { group = 'com.salesforce.mobilesdk' - version = '11.1.0' + version = '11.0.1' repositories { mavenLocal() maven { diff --git a/external/shared b/external/shared index 07e73145e2..67bc9f049d 160000 --- a/external/shared +++ b/external/shared @@ -1 +1 @@ -Subproject commit 07e73145e29510675be7f68a0191ac9d39dc7195 +Subproject commit 67bc9f049d76331db8d08006ebd433a023f515d9 diff --git a/libs/MobileSync/AndroidManifest.xml b/libs/MobileSync/AndroidManifest.xml index b38eb0eca8..c2881128d8 100644 --- a/libs/MobileSync/AndroidManifest.xml +++ b/libs/MobileSync/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="11.0.1"> diff --git a/libs/MobileSync/build.gradle b/libs/MobileSync/build.gradle index 16c5ff430d..016bbd89aa 100644 --- a/libs/MobileSync/build.gradle +++ b/libs/MobileSync/build.gradle @@ -76,7 +76,7 @@ android { ext { PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk' - PUBLISH_VERSION = '11.1.0' + PUBLISH_VERSION = '11.0.1' PUBLISH_ARTIFACT_ID = 'MobileSync' } diff --git a/libs/SalesforceAnalytics/AndroidManifest.xml b/libs/SalesforceAnalytics/AndroidManifest.xml index e752fdf1ef..3870cde945 100644 --- a/libs/SalesforceAnalytics/AndroidManifest.xml +++ b/libs/SalesforceAnalytics/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="11.0.1"> diff --git a/libs/SalesforceAnalytics/build.gradle b/libs/SalesforceAnalytics/build.gradle index 0bcb6a68f9..55e1bf0e5a 100644 --- a/libs/SalesforceAnalytics/build.gradle +++ b/libs/SalesforceAnalytics/build.gradle @@ -69,7 +69,7 @@ android { ext { PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk' - PUBLISH_VERSION = '11.1.0' + PUBLISH_VERSION = '11.0.1' PUBLISH_ARTIFACT_ID = 'SalesforceAnalytics' } diff --git a/libs/SalesforceHybrid/AndroidManifest.xml b/libs/SalesforceHybrid/AndroidManifest.xml index d4150c2e70..d5ffa52f2f 100644 --- a/libs/SalesforceHybrid/AndroidManifest.xml +++ b/libs/SalesforceHybrid/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="11.0.1"> diff --git a/libs/SalesforceHybrid/build.gradle b/libs/SalesforceHybrid/build.gradle index dd7e1e3336..17cfb4b4cc 100644 --- a/libs/SalesforceHybrid/build.gradle +++ b/libs/SalesforceHybrid/build.gradle @@ -73,7 +73,7 @@ android { ext { PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk' - PUBLISH_VERSION = '11.1.0' + PUBLISH_VERSION = '11.0.1' PUBLISH_ARTIFACT_ID = 'SalesforceHybrid' } diff --git a/libs/SalesforceHybrid/res/xml/config.xml b/libs/SalesforceHybrid/res/xml/config.xml index f749986187..bb7b87afca 100644 --- a/libs/SalesforceHybrid/res/xml/config.xml +++ b/libs/SalesforceHybrid/res/xml/config.xml @@ -1,7 +1,7 @@ + version = "11.0.1"> diff --git a/libs/SalesforceReact/AndroidManifest.xml b/libs/SalesforceReact/AndroidManifest.xml index d4150c2e70..d5ffa52f2f 100644 --- a/libs/SalesforceReact/AndroidManifest.xml +++ b/libs/SalesforceReact/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="11.0.1"> diff --git a/libs/SalesforceReact/build.gradle b/libs/SalesforceReact/build.gradle index 05e7d692eb..7c6fb39eb3 100644 --- a/libs/SalesforceReact/build.gradle +++ b/libs/SalesforceReact/build.gradle @@ -124,7 +124,7 @@ afterEvaluate { ext { PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk' - PUBLISH_VERSION = '11.1.0' + PUBLISH_VERSION = '11.0.1' PUBLISH_ARTIFACT_ID = 'SalesforceReact' } diff --git a/libs/SalesforceReact/package.json b/libs/SalesforceReact/package.json index 8f9f0a6a06..3aa6d3cb7d 100644 --- a/libs/SalesforceReact/package.json +++ b/libs/SalesforceReact/package.json @@ -1,6 +1,6 @@ { "name": "SalesforceReact", - "version": "11.1.0", + "version": "11.0.1", "private": true, "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start" @@ -9,7 +9,7 @@ "create-react-class": "^15.7.0", "react": "18.1.0", "react-native": "0.70.6", - "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#dev" + "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#v11.0.1" }, "devDependencies": { "@babel/core": "^7.12.9", diff --git a/libs/SalesforceSDK/AndroidManifest.xml b/libs/SalesforceSDK/AndroidManifest.xml index 6b6eea8c12..41f6ab340c 100644 --- a/libs/SalesforceSDK/AndroidManifest.xml +++ b/libs/SalesforceSDK/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:versionName="11.0.1"> diff --git a/libs/SalesforceSDK/build.gradle b/libs/SalesforceSDK/build.gradle index 851feecbb7..91f5b1db25 100644 --- a/libs/SalesforceSDK/build.gradle +++ b/libs/SalesforceSDK/build.gradle @@ -77,7 +77,7 @@ android { ext { PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk' - PUBLISH_VERSION = '11.1.0' + PUBLISH_VERSION = '11.0.1' PUBLISH_ARTIFACT_ID = 'SalesforceSDK' } diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java index 9f0fb10ea3..8c8f12fee6 100644 --- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java +++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java @@ -116,7 +116,7 @@ public class SalesforceSDKManager implements LifecycleObserver { /** * Current version of this SDK. */ - public static final String SDK_VERSION = "11.1.0.dev"; + public static final String SDK_VERSION = "11.0.1"; /** * Intent action meant for instances of SalesforceSDKManager residing in other processes diff --git a/libs/SmartStore/AndroidManifest.xml b/libs/SmartStore/AndroidManifest.xml index 0325a5a267..1d76a6ac56 100644 --- a/libs/SmartStore/AndroidManifest.xml +++ b/libs/SmartStore/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="11.0.1"> diff --git a/libs/SmartStore/build.gradle b/libs/SmartStore/build.gradle index 34cfa1a8a1..02f96bd525 100644 --- a/libs/SmartStore/build.gradle +++ b/libs/SmartStore/build.gradle @@ -75,7 +75,7 @@ android { ext { PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk' - PUBLISH_VERSION = '11.1.0' + PUBLISH_VERSION = '11.0.1' PUBLISH_ARTIFACT_ID = 'SmartStore' } diff --git a/libs/test/SalesforceHybridTest/res/xml/config.xml b/libs/test/SalesforceHybridTest/res/xml/config.xml index b10009f64f..2a8ee17e4b 100644 --- a/libs/test/SalesforceHybridTest/res/xml/config.xml +++ b/libs/test/SalesforceHybridTest/res/xml/config.xml @@ -1,7 +1,7 @@ + version = "11.0.1"> diff --git a/package.json b/package.json index 07f45a45b8..57ca84a6ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "SalesforceMobileSDK-Android", - "version": "11.1.0", + "version": "11.0.1", "description": "Salesforce Mobile SDK for Android", "keywords": [ "mobilesdk", diff --git a/tools/generate_doc.sh b/tools/generate_doc.sh index 799de34c22..ad5d194cfb 100755 --- 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 11.1 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 11.0 API" -sourcepath "libs/SalesforceAnalytics/src:libs/SalesforceSDK/src:libs/SmartStore/src:libs/MobileSync/src:libs/SalesforceHybrid/src:libs/SalesforceReact/src" -subpackages com fi