Skip to content

Commit 71a7eac

Browse files
wmathurinwmathurin
committed
Merging dev into master
2 parents 7de5ffc + 2421193 commit 71a7eac

29 files changed

Lines changed: 233 additions & 93 deletions

File tree

‎.circleci/gitChangedLibs.rb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
for prfile in prfiles
2121
path = prfile["filename"]
22-
for lib in libsTopoSorted
23-
if path.include? lib
24-
libsModified.add(lib)
22+
libsTopoSorted.each do |lib|
23+
if path.include?(lib)
24+
libsModified.merge(libsTopoSorted[libsTopoSorted.index(lib)..])
25+
break
2526
end
2627
end
2728
end

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This pulls submodule dependencies from github.
2323
Introduction
2424
==
2525

26-
### What's New in 12.0.0
26+
### What's New in 12.1.0
2727
See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
2828

2929
### Native Applications

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717

1818
allprojects {
1919
group = "com.salesforce.mobilesdk"
20-
version = "12.0.0"
20+
version = "12.1.0"
2121

2222
// Ensure that we do not use newer language features that would make the SDK incompatible with
2323
// apps that do not target the latest version of Kotlin.

‎external/shared‎

Submodule shared updated 34 files

‎libs/MobileSync/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="83"
5-
android:versionName="12.0.0">
4+
android:versionCode="84"
5+
android:versionName="12.1.0.dev">
66

77
<application />
88

‎libs/MobileSync/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
4-
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "MobileSync"
66

77
plugins {

‎libs/SalesforceAnalytics/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="83"
5-
android:versionName="12.0.0">
4+
android:versionCode="84"
5+
android:versionName="12.1.0.dev">
66

77
<uses-permission android:name="android.permission.INTERNET" />
88
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

‎libs/SalesforceAnalytics/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
4-
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceAnalytics"
66

77
plugins {

‎libs/SalesforceHybrid/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="83"
5-
android:versionName="12.0.0">
4+
android:versionCode="84"
5+
android:versionName="12.1.0.dev">
66

77
<application>
88
<activity android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"

‎libs/SalesforceHybrid/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
4-
rootProject.ext["PUBLISH_VERSION"] = "12.0.0"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceHybrid"
66

77
plugins {

0 commit comments

Comments
 (0)