diff --git a/README.md b/README.md index d61e57f6bd..36ee0a2784 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ This pulls submodule dependencies from github. Introduction == -### What's New in 9.2.0 -See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases/tag/v9.2.0). +### What's New in 9.1.1 +See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases/tag/v9.1.1). ### Native Applications The Salesforce Mobile SDK provides essential libraries for quickly building native mobile apps that seamlessly integrate with the Salesforce cloud architecture. Out of the box, we provide an implementation of OAuth2, abstracting away the complexity of securely storing refresh tokens or fetching a new session ID when a session expires. The SDK also provides Java wrappers for the Salesforce REST API, making it easy to retrieve, store, and manipulate data. diff --git a/build.gradle b/build.gradle index c48352f5ca..784532a9e6 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { allprojects { group = 'com.salesforce.mobilesdk' - version = '9.2.0' + version = '9.1.1' repositories { mavenLocal() maven { diff --git a/external/shared b/external/shared index 911f8060e7..151f41b753 160000 --- a/external/shared +++ b/external/shared @@ -1 +1 @@ -Subproject commit 911f8060e71384fcb5b7260694d9cb827f4f674c +Subproject commit 151f41b7530cb6b5f46b54f2e62fa3becc1be293 diff --git a/libs/MobileSync/AndroidManifest.xml b/libs/MobileSync/AndroidManifest.xml index 2f35b3e17a..b34db2acad 100644 --- a/libs/MobileSync/AndroidManifest.xml +++ b/libs/MobileSync/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:versionName="9.1.1"> diff --git a/libs/SalesforceAnalytics/AndroidManifest.xml b/libs/SalesforceAnalytics/AndroidManifest.xml index bc7d4d972e..e779c03fc8 100644 --- a/libs/SalesforceAnalytics/AndroidManifest.xml +++ b/libs/SalesforceAnalytics/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:versionName="9.1.1"> diff --git a/libs/SalesforceHybrid/AndroidManifest.xml b/libs/SalesforceHybrid/AndroidManifest.xml index 99e5847ccb..a11bb9665d 100644 --- a/libs/SalesforceHybrid/AndroidManifest.xml +++ b/libs/SalesforceHybrid/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:versionName="9.1.1"> diff --git a/libs/SalesforceHybrid/res/xml/config.xml b/libs/SalesforceHybrid/res/xml/config.xml index e6a48e7527..ca9a2f6193 100644 --- a/libs/SalesforceHybrid/res/xml/config.xml +++ b/libs/SalesforceHybrid/res/xml/config.xml @@ -1,7 +1,7 @@ + version = "9.1.1"> diff --git a/libs/SalesforceReact/AndroidManifest.xml b/libs/SalesforceReact/AndroidManifest.xml index b8598b6400..c184f529b8 100644 --- a/libs/SalesforceReact/AndroidManifest.xml +++ b/libs/SalesforceReact/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:versionName="9.1.1"> diff --git a/libs/SalesforceReact/package.json b/libs/SalesforceReact/package.json index aeafc78ba5..90cfd544cd 100644 --- a/libs/SalesforceReact/package.json +++ b/libs/SalesforceReact/package.json @@ -1,6 +1,6 @@ { "name": "SalesforceReact", - "version": "9.2.0", + "version": "9.1.1", "private": true, "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start" @@ -8,7 +8,7 @@ "dependencies": { "react": "16.13.1", "react-native": "0.63.4", - "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#dev", + "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#v9.1.1", "create-react-class": "^15.7.0" }, "devDependencies": { diff --git a/libs/SalesforceSDK/AndroidManifest.xml b/libs/SalesforceSDK/AndroidManifest.xml index 449d563c4f..5fb8f5a9d2 100644 --- a/libs/SalesforceSDK/AndroidManifest.xml +++ b/libs/SalesforceSDK/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:versionName="9.1.1"> diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java index 5ad3c057a9..738fd996e0 100644 --- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java +++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.java @@ -108,7 +108,7 @@ public class SalesforceSDKManager { /** * Current version of this SDK. */ - public static final String SDK_VERSION = "9.2.0.dev"; + public static final String SDK_VERSION = "9.1.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 91cd63ec14..e637f9d33f 100644 --- a/libs/SmartStore/AndroidManifest.xml +++ b/libs/SmartStore/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:versionName="9.1.1"> diff --git a/libs/test/SalesforceHybridTest/res/xml/config.xml b/libs/test/SalesforceHybridTest/res/xml/config.xml index b59a2b41dd..9fb47de5d1 100644 --- a/libs/test/SalesforceHybridTest/res/xml/config.xml +++ b/libs/test/SalesforceHybridTest/res/xml/config.xml @@ -1,7 +1,7 @@ + version = "9.1.1"> diff --git a/package.json b/package.json index 2e318584a3..0954b2fbe5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "SalesforceMobileSDK-Android", - "version": "9.2.0", + "version": "9.1.1", "description": "Salesforce Mobile SDK for Android", "keywords": [ "mobilesdk", diff --git a/tools/generate_doc.sh b/tools/generate_doc.sh index 4faff640a9..ae78e65370 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 9.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 9.1 API" -sourcepath "libs/SalesforceAnalytics/src:libs/SalesforceSDK/src:libs/SmartStore/src:libs/MobileSync/src:libs/SalesforceHybrid/src:libs/SalesforceReact/src" -subpackages com fi