Skip to content

Commit b1973e1

Browse files
committed
Merging dev into master
2 parents ca7f05a + 2c18b1c commit b1973e1

File tree

203 files changed

+7208
-6363
lines changed

Some content is hidden

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

203 files changed

+7208
-6363
lines changed

.circleci/config.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ jobs:
101101
export CIRCLE_PULL_REQUESTS="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
102102
export CI_PULL_REQUEST="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
103103
export CI_PULL_REQUESTS="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
104-
# This token is completely harmless as it only has public permission and
105-
# is owned by a bot who isn't a member of the org.
106-
DANGER_GITHUB_API_TOKEN="279a29d75427e4178cef""b7b5b2d7646c540f025a" danger --dangerfile=.circleci/Dangerfile_PR.rb --danger_id=PR-Check --verbose
104+
danger --dangerfile=.circleci/Dangerfile_PR.rb --danger_id=PR-Check --verbose
107105
else
108106
echo "No need to run Danger."
109107
fi
@@ -213,9 +211,7 @@ jobs:
213211
if ls libs/<< parameters.lib >>/build/outputs/androidTest-results/connected/*.xml 1> /dev/null 2>&1; then
214212
mv libs/<< parameters.lib >>/build/outputs/androidTest-results/connected/*.xml libs/<< parameters.lib >>/build/outputs/androidTest-results/connected/test-results.xml
215213
fi
216-
# This token is completely harmless as it only has public permission and
217-
# is owned by a bot who isn't a member of hte org.
218-
DANGER_GITHUB_API_TOKEN="279a29d75427e4178cef""b7b5b2d7646c540f025a" danger --dangerfile=.circleci/Dangerfile_Lib.rb --danger_id=<< parameters.lib >> --verbose
214+
danger --dangerfile=.circleci/Dangerfile_Lib.rb --danger_id=<< parameters.lib >> --verbose
219215
background: true
220216
when: always
221217
- store_artifacts:

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

2929
### Native Applications

build.gradle

+13-3
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ buildscript {
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:7.2.1'
13+
classpath 'com.android.tools.build:gradle:7.4.2'
1414
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
15+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21"
1516
}
1617
}
1718

1819
allprojects {
1920
group = 'com.salesforce.mobilesdk'
20-
version = '10.2.0'
21+
version = '11.0.0'
2122
repositories {
2223
mavenLocal()
2324
maven {
@@ -32,4 +33,13 @@ allprojects {
3233
google()
3334
mavenCentral()
3435
}
35-
}
36+
37+
// Ensure that we do not use newer language features that would make the SDK incompatible with
38+
// apps that do not target the latest version of Kotlin.
39+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
40+
kotlinOptions {
41+
apiVersion = "1.6"
42+
languageVersion = "1.6"
43+
}
44+
}
45+
}

external/shared

Submodule shared updated 49 files

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
cdvCompileSdkVersion=32
1+
cdvCompileSdkVersion=33
22
cdvMinSdkVersion=24
33
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.jar

911 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)