Skip to content

Commit

Permalink
Merge pull request #2556 from wmathurin/master
Browse files Browse the repository at this point in the history
Fixing setversion.sh script and setting version to 12
  • Loading branch information
wmathurin authored Apr 26, 2024
2 parents c9c2d1c + 12e5476 commit 7de5ffc
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

allprojects {
group = "com.salesforce.mobilesdk"
version = "11.1.0"
version = "12.0.0"

// 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.
Expand Down
2 changes: 1 addition & 1 deletion libs/MobileSync/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@file:Suppress("UnstableApiUsage")

rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
rootProject.ext["PUBLISH_VERSION"] = "11.1.0"
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "MobileSync"

plugins {
Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceAnalytics/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@file:Suppress("UnstableApiUsage")

rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
rootProject.ext["PUBLISH_VERSION"] = "11.1.0"
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceAnalytics"

plugins {
Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceHybrid/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@file:Suppress("UnstableApiUsage")

rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
rootProject.ext["PUBLISH_VERSION"] = "11.1.0"
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceHybrid"

plugins {
Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceReact/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"] = "11.1.0"
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceReact"

plugins {
Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceSDK/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@file:Suppress("UnstableApiUsage")

rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
rootProject.ext["PUBLISH_VERSION"] = "11.1.0"
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceSDK"

plugins {
Expand Down
2 changes: 1 addition & 1 deletion libs/SmartStore/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@file:Suppress("UnstableApiUsage")

rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
rootProject.ext["PUBLISH_VERSION"] = "11.1.0"
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SmartStore"

plugins {
Expand Down
4 changes: 2 additions & 2 deletions setversion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ update_top_build_gradle ()
{
local file=$1
local versionName=$2
gsed -i "s/version = '[0-9\.]*'/version = '${versionName}'/g" ${file}
gsed -i "s/version = \"[0-9\.]*\"/version = \"${versionName}\"/g" ${file}
}

update_build_gradle ()
{
local file=$1
local versionName=$2
gsed -i "s/PUBLISH_VERSION = '[0-9\.]*'/PUBLISH_VERSION = '${versionName}'/g" ${file}
gsed -i "s/\[\"PUBLISH_VERSION\"\] = \"[0-9\.]*\"/\[\"PUBLISH_VERSION\"\] = \"${versionName}\"/g" ${file}
}

update_manifest ()
Expand Down

0 comments on commit 7de5ffc

Please sign in to comment.