diff --git a/README.md b/README.md index 4143e7ce85..5668784d1b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This pulls submodule dependencies from github. Introduction == -### What's New in 12.1.0 +### What's New in 12.0.1 See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases). ### Native Applications diff --git a/build.gradle.kts b/build.gradle.kts index 0484ca3d95..642012de60 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ buildscript { allprojects { group = "com.salesforce.mobilesdk" - version = "12.1.0" + version = "12.0.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 index 67b3c53602..fa9861b46b 160000 --- a/external/shared +++ b/external/shared @@ -1 +1 @@ -Subproject commit 67b3c53602404af9ec62a05f34654b35ac843e3d +Subproject commit fa9861b46b90a7a3d04f9bcc5c1409462ee8e1d3 diff --git a/libs/MobileSync/AndroidManifest.xml b/libs/MobileSync/AndroidManifest.xml index 82bf14edba..8d3eb91ad5 100644 --- a/libs/MobileSync/AndroidManifest.xml +++ b/libs/MobileSync/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.0.1"> diff --git a/libs/MobileSync/build.gradle.kts b/libs/MobileSync/build.gradle.kts index 11bde3b28f..70d13592da 100644 --- 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.0" +rootProject.ext["PUBLISH_VERSION"] = "12.0.1" rootProject.ext["PUBLISH_ARTIFACT_ID"] = "MobileSync" plugins { diff --git a/libs/SalesforceAnalytics/AndroidManifest.xml b/libs/SalesforceAnalytics/AndroidManifest.xml index 2c7b0bd7a9..155ebafbf5 100644 --- a/libs/SalesforceAnalytics/AndroidManifest.xml +++ b/libs/SalesforceAnalytics/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.0.1"> diff --git a/libs/SalesforceAnalytics/build.gradle.kts b/libs/SalesforceAnalytics/build.gradle.kts index d3685a121d..9e1a1265c9 100644 --- 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.0" +rootProject.ext["PUBLISH_VERSION"] = "12.0.1" rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceAnalytics" plugins { diff --git a/libs/SalesforceHybrid/AndroidManifest.xml b/libs/SalesforceHybrid/AndroidManifest.xml index 695a8a1580..c42f80b2c2 100644 --- a/libs/SalesforceHybrid/AndroidManifest.xml +++ b/libs/SalesforceHybrid/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.0.1"> + version = "12.0.1"> diff --git a/libs/SalesforceReact/AndroidManifest.xml b/libs/SalesforceReact/AndroidManifest.xml index fd756014b2..3a9fe2ba3a 100644 --- a/libs/SalesforceReact/AndroidManifest.xml +++ b/libs/SalesforceReact/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.0.1"> + android:versionName="12.0.1"> diff --git a/libs/SalesforceSDK/build.gradle.kts b/libs/SalesforceSDK/build.gradle.kts index ff7736e1a0..4f990b83b5 100644 --- 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.1.0" +rootProject.ext["PUBLISH_VERSION"] = "12.0.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 index 3f0b053cb7..377511752b 100644 --- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt +++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt @@ -1448,7 +1448,7 @@ open class SalesforceSDKManager protected constructor( protected var INSTANCE: SalesforceSDKManager? = null /** The current version of this SDK */ - const val SDK_VERSION = "12.1.0.dev" + const val SDK_VERSION = "12.0.1" /** * An intent action meant for instances of Salesforce SDK manager diff --git a/libs/SmartStore/AndroidManifest.xml b/libs/SmartStore/AndroidManifest.xml index f6c6b2de0a..587d378d6f 100644 --- a/libs/SmartStore/AndroidManifest.xml +++ b/libs/SmartStore/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.0.1"> diff --git a/libs/SmartStore/build.gradle.kts b/libs/SmartStore/build.gradle.kts index d65e4e6d72..29c664f230 100644 --- 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.1.0" +rootProject.ext["PUBLISH_VERSION"] = "12.0.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 index 690d3ceeca..34444454b1 100644 --- a/libs/test/SalesforceHybridTest/res/xml/config.xml +++ b/libs/test/SalesforceHybridTest/res/xml/config.xml @@ -1,7 +1,7 @@ + version = "12.0.1"> diff --git a/package.json b/package.json index a8eda9c744..c18459bd07 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "SalesforceMobileSDK-Android", - "version": "12.1.0", + "version": "12.0.1", "description": "Salesforce Mobile SDK for Android", "keywords": [ "mobilesdk", diff --git a/tools/generate_doc.sh b/tools/generate_doc.sh index 6936fd2069..4f796b2bf8 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 12.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 12.0 API" -sourcepath "libs/SalesforceAnalytics/src:libs/SalesforceSDK/src:libs/SmartStore/src:libs/MobileSync/src:libs/SalesforceHybrid/src:libs/SalesforceReact/src" -subpackages com fi