Skip to content

Commit 96b1701

Browse files
wmathurinwmathurin
committed
Merging dev into master
2 parents 7c88950 + fbc26b4 commit 96b1701

File tree

76 files changed

+3799
-3235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3799
-3235
lines changed

‎.circleci/config.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,10 @@ jobs:
118118
- restore_cache: *restore-node-cache
119119
- restore_cache: *restore-ruby-cache
120120
- run: *setup-env
121-
- run:
122-
name: Static Analysis
123-
command: ./gradlew libs:<< parameters.lib >>:lint
121+
# XXX commented out because gradle build daemon keep disappears for some of the libs
122+
# - run:
123+
# name: Static Analysis
124+
# command: ./gradlew libs:<< parameters.lib >>:lint
124125
- run:
125126
name: Build for Testing
126127
command: |

‎README.md

+1-1
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.1.1
26+
### What's New in 12.2.0
2727
See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
2828

2929
### Native Applications

‎build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath("com.android.tools.build:gradle:8.5.0")
12+
classpath("com.android.tools.build:gradle:8.6.1")
1313
classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
1414
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
1515
classpath("org.jacoco:org.jacoco.core:0.8.12")
@@ -18,7 +18,7 @@ buildscript {
1818

1919
allprojects {
2020
group = "com.salesforce.mobilesdk"
21-
version = "12.1.1"
21+
version = "12.2.0"
2222

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

‎buildSrc/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77
}
88

99
dependencies {
10-
implementation("com.android.tools.build:gradle:8.5.0")
10+
implementation("com.android.tools.build:gradle:8.6.1")
1111
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
1212
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")
1313
}

‎external/shared

Submodule shared updated 34 files

‎hybrid/HybridSampleApps/AccountEditor/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<!--
4747
<activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
4848
android:theme="@style/SalesforceSDK"
49-
android:launchMode="singleTop"
49+
android:launchMode="singleTask"
5050
android:exported="true">
5151
5252
<intent-filter>

‎hybrid/HybridSampleApps/MobileSyncExplorerHybrid/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<!--
4848
<activity android:name="com.salesforce.androidsdk.ui.LoginActivity"
4949
android:theme="@style/SalesforceSDK"
50-
android:launchMode="singleTop"
50+
android:launchMode="singleTask"
5151
android:exported="true">
5252
5353
<intent-filter>

‎libs/MobileSync/AndroidManifest.xml

+2-2
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="86"
5-
android:versionName="12.1.1">
4+
android:versionCode="87"
5+
android:versionName="12.2.0.dev">
66

77
<application />
88

‎libs/MobileSync/build.gradle.kts

+1-1
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.1.1"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "MobileSync"
66

77
plugins {

‎libs/SalesforceAnalytics/AndroidManifest.xml

+2-2
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="86"
5-
android:versionName="12.1.1">
4+
android:versionCode="87"
5+
android:versionName="12.2.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

+1-1
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.1.1"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceAnalytics"
66

77
plugins {

‎libs/SalesforceHybrid/AndroidManifest.xml

+2-2
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="86"
5-
android:versionName="12.1.1">
4+
android:versionCode="87"
5+
android:versionName="12.2.0.dev">
66

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

‎libs/SalesforceHybrid/build.gradle.kts

+1-1
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.1.1"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceHybrid"
66

77
plugins {

‎libs/SalesforceHybrid/res/xml/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<widget xmlns = "http://www.w3.org/ns/widgets"
33
id = "com.salesforce.androidsdk"
4-
version = "12.1.1">
4+
version = "12.2.0">
55

66
<content src="index.html" />
77

0 commit comments

Comments
 (0)