Skip to content

Commit

Permalink
Merging dev into master
Browse files Browse the repository at this point in the history
  • Loading branch information
wmathurin committed Jun 22, 2023
2 parents ca7f05a + 2c18b1c commit b1973e1
Show file tree
Hide file tree
Showing 203 changed files with 7,208 additions and 6,363 deletions.
8 changes: 2 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ jobs:
export CIRCLE_PULL_REQUESTS="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
export CI_PULL_REQUEST="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
export CI_PULL_REQUESTS="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
# This token is completely harmless as it only has public permission and
# is owned by a bot who isn't a member of the org.
DANGER_GITHUB_API_TOKEN="279a29d75427e4178cef""b7b5b2d7646c540f025a" danger --dangerfile=.circleci/Dangerfile_PR.rb --danger_id=PR-Check --verbose
danger --dangerfile=.circleci/Dangerfile_PR.rb --danger_id=PR-Check --verbose
else
echo "No need to run Danger."
fi
Expand Down Expand Up @@ -213,9 +211,7 @@ jobs:
if ls libs/<< parameters.lib >>/build/outputs/androidTest-results/connected/*.xml 1> /dev/null 2>&1; then
mv libs/<< parameters.lib >>/build/outputs/androidTest-results/connected/*.xml libs/<< parameters.lib >>/build/outputs/androidTest-results/connected/test-results.xml
fi
# This token is completely harmless as it only has public permission and
# is owned by a bot who isn't a member of hte org.
DANGER_GITHUB_API_TOKEN="279a29d75427e4178cef""b7b5b2d7646c540f025a" danger --dangerfile=.circleci/Dangerfile_Lib.rb --danger_id=<< parameters.lib >> --verbose
danger --dangerfile=.circleci/Dangerfile_Lib.rb --danger_id=<< parameters.lib >> --verbose
background: true
when: always
- store_artifacts:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This pulls submodule dependencies from github.
Introduction
==

### What's New in 10.2.0
### What's New in 11.0.0
See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).

### Native Applications
Expand Down
16 changes: 13 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21"
}
}

allprojects {
group = 'com.salesforce.mobilesdk'
version = '10.2.0'
version = '11.0.0'
repositories {
mavenLocal()
maven {
Expand All @@ -32,4 +33,13 @@ allprojects {
google()
mavenCentral()
}
}

// 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.
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
apiVersion = "1.6"
languageVersion = "1.6"
}
}
}
2 changes: 1 addition & 1 deletion external/shared
Submodule shared updated 49 files
+1 −1 gen/cordova_plugins.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.plugin.mobilesync.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.plugin.network.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.plugin.oauth.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.plugin.sdkinfo.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.plugin.sfaccountmanager.js
+1 −4 gen/plugins/com.salesforce/com.salesforce.plugin.smartstore.client.js
+1 −39 gen/plugins/com.salesforce/com.salesforce.plugin.smartstore.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.util.bootstrap.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.util.event.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.util.exec.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.util.logger.js
+1 −1 gen/plugins/com.salesforce/com.salesforce.util.promiser.js
+1 −2 gen/plugins/com.salesforce/com.salesforce.util.push.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.plugin.mobilesync.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.plugin.network.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.plugin.oauth.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.plugin.sdkinfo.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.plugin.sfaccountmanager.js
+1 −4 gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartstore.client.js
+1 −39 gen/plugins_with_define/com.salesforce/com.salesforce.plugin.smartstore.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.util.bootstrap.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.util.event.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.util.exec.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.util.logger.js
+1 −1 gen/plugins_with_define/com.salesforce/com.salesforce.util.promiser.js
+1 −2 gen/plugins_with_define/com.salesforce/com.salesforce.util.push.js
+1 −43 libs/cordova.force.js
+1 −1 package.json
+3 −4 samples/accounteditor/bootconfig.json
+3 −4 samples/contactexplorer/bootconfig.json
+2 −3 samples/fileexplorer/bootconfig.json
+2 −3 samples/mobilesyncexplorer/bootconfig.json
+2 −3 samples/notesync/bootconfig.json
+2 −3 samples/simplesyncreact/bootconfig.json
+3 −4 samples/smartstoreexplorer/bootconfig.json
+0 −31 samples/smartstoreexplorer/smartstoreexplorer.js
+2 −3 samples/userandgroupsearch/bootconfig.json
+1 −1 samples/userlist/bootconfig.json
+2 −3 samples/usersearch/bootconfig.json
+8 −9 samples/vfconnector/bootconfig.json
+2 −3 test/MockSDKInfo.js
+7 −29 test/MockSmartStore.js
+1 −1 test/SFSDKInfoTestSuite.js
+0 −155 test/SFSmartStoreTestSuite.js
+1 −1 test/SFTestRunnerPlugin.js
+1 −2 test/forcepluginstest/bootconfig.json
+1 −1 tools/bower.json
+1 −1 tools/package.json
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cdvCompileSdkVersion=32
cdvCompileSdkVersion=33
cdvMinSdkVersion=24
android.useAndroidX=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b1973e1

Please sign in to comment.