From 7c88950ef8a38c514f68da99fae7fa51a73a7a01 Mon Sep 17 00:00:00 2001 From: Wolfgang Mathurin Date: Thu, 29 Aug 2024 10:42:56 -0700 Subject: [PATCH] Mobile SDK 12.1.1 --- README.md | 2 +- build.gradle.kts | 2 +- external/shared | 2 +- libs/MobileSync/AndroidManifest.xml | 2 +- libs/MobileSync/build.gradle.kts | 2 +- libs/SalesforceAnalytics/AndroidManifest.xml | 2 +- libs/SalesforceAnalytics/build.gradle.kts | 2 +- libs/SalesforceHybrid/AndroidManifest.xml | 2 +- libs/SalesforceHybrid/build.gradle.kts | 2 +- libs/SalesforceHybrid/res/xml/config.xml | 2 +- libs/SalesforceReact/AndroidManifest.xml | 2 +- libs/SalesforceReact/build.gradle.kts | 2 +- libs/SalesforceReact/package.json | 4 ++-- libs/SalesforceSDK/AndroidManifest.xml | 2 +- libs/SalesforceSDK/build.gradle.kts | 2 +- .../src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt | 2 +- libs/SmartStore/AndroidManifest.xml | 2 +- libs/SmartStore/build.gradle.kts | 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 bbf028aa73..1b16d5c0e8 100644 --- 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 index 36a3db0137..702250e7e3 100644 --- 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 index 603a4305b2..4cd3676777 160000 --- 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 index f7961bfed5..c09d4ceddb 100644 --- a/libs/MobileSync/AndroidManifest.xml +++ b/libs/MobileSync/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.1.1"> diff --git a/libs/MobileSync/build.gradle.kts b/libs/MobileSync/build.gradle.kts index b1a0088209..cee0438ce1 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.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 index 2a407a24ac..a4497e3f2a 100644 --- a/libs/SalesforceAnalytics/AndroidManifest.xml +++ b/libs/SalesforceAnalytics/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.1.1"> diff --git a/libs/SalesforceAnalytics/build.gradle.kts b/libs/SalesforceAnalytics/build.gradle.kts index 2d714e6e0b..d3cccd4b4c 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.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 index b0941a435c..6a508b33d6 100644 --- a/libs/SalesforceHybrid/AndroidManifest.xml +++ b/libs/SalesforceHybrid/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.1.1"> + version = "12.1.1"> diff --git a/libs/SalesforceReact/AndroidManifest.xml b/libs/SalesforceReact/AndroidManifest.xml index 7e0edb8d91..e963bfb6ff 100644 --- a/libs/SalesforceReact/AndroidManifest.xml +++ b/libs/SalesforceReact/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.1.1"> + android:versionName="12.1.1"> diff --git a/libs/SalesforceSDK/build.gradle.kts b/libs/SalesforceSDK/build.gradle.kts index 8bf7e65fb0..e52927565b 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.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 index a171762c23..d925ded553 100644 --- 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 index 10514b5256..3f6ec2032a 100644 --- a/libs/SmartStore/AndroidManifest.xml +++ b/libs/SmartStore/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="12.1.1"> diff --git a/libs/SmartStore/build.gradle.kts b/libs/SmartStore/build.gradle.kts index 31fa3352e1..1fcb3cd866 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.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 index 2b449875ed..6e30c6f8ed 100644 --- a/libs/test/SalesforceHybridTest/res/xml/config.xml +++ b/libs/test/SalesforceHybridTest/res/xml/config.xml @@ -1,7 +1,7 @@ + version = "12.1.1"> diff --git a/package.json b/package.json index b7f666aa68..ea94e5ddf3 100644 --- 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 index b04c4e1df4..6936fd2069 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.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