Skip to content

Commit 332f5eb

Browse files
wmathurinwmathurin
committed
Merging dev into master
2 parents 8017d4d + 7f770ce commit 332f5eb

File tree

300 files changed

+3038
-1912
lines changed

Some content is hidden

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

300 files changed

+3038
-1912
lines changed

‎.circleci/Dangerfile_Lib.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
end
2020

2121
# State what Library the test failures are for (or don't post at all).
22-
markdown "# Tests results for #{ENV['CURRENT_LIB']}" unless status_report[:errors].empty? && status_report[:warnings].empty?
22+
markdown "# Tests results for #{ENV['CURRENT_LIB']}" unless status_report[:errors].empty? && status_report[:warnings].empty?

‎.circleci/Dangerfile_PR.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
warn("PR is classed as Work in Progress", sticky: true)
1313
end
1414
if has_dnm_label || has_dnm_title
15-
warn("At the authors request please DO NOT MERGE this PR", sticky: true)
15+
warn("At the author's request please DO NOT MERGE this PR", sticky: true)
1616
end
1717

1818
fail("Please re-submit this PR to the dev branch, we may have already fixed your issue.", sticky: true) if github.branch_for_base != "dev"

‎.circleci/codecov.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ coverage:
2525
target: auto
2626
paths: "libs/SmartStore/src/"
2727
flags: SmartStore
28-
SmartSync:
28+
MobileSync:
2929
target: auto
30-
paths: "libs/SmartSync/src/"
31-
flags: SmartSync
30+
paths: "libs/MobileSync/src/"
31+
flags: MobileSync
3232
SalesforceReact:
3333
target: auto
3434
paths: "libs/SalesforceReact/src/"

‎.circleci/config.yml

+51-96
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ aliases:
55
checksum "libs/SalesforceAnalytics/build.gradle" }}-{{
66
checksum "libs/SalesforceSDK/build.gradle" }}-{{
77
checksum "libs/SmartStore/build.gradle" }}-{{
8-
checksum "libs/SmartSync/build.gradle" }}-{{
8+
checksum "libs/MobileSync/build.gradle" }}-{{
99
checksum "libs/SalesforceHybrid/build.gradle" }}-{{
1010
checksum "libs/SalesforceReact/build.gradle" }}
1111

@@ -60,16 +60,15 @@ aliases:
6060
"libs/SalesforceSDK/build/outputs/apk/androidTest/debug/SalesforceSDK-debug-androidTest.apk"
6161
- &smartStore-apk-path
6262
"libs/SmartStore/build/outputs/apk/androidTest/debug/SmartStore-debug-androidTest.apk"
63-
- &smartSync-apk-path
64-
"libs/SmartSync/build/outputs/apk/androidTest/debug/SmartSync-debug-androidTest.apk"
63+
- &mobileSync-apk-path
64+
"libs/MobileSync/build/outputs/apk/androidTest/debug/MobileSync-debug-androidTest.apk"
6565
- &salesforceHybrid-apk-path
6666
"libs/SalesforceHybrid/build/outputs/apk/androidTest/debug/SalesforceHybrid-debug-androidTest.apk"
6767
- &restExplorer-apk-path
6868
"native/NativeSampleApps/RestExplorer/build/outputs/apk/androidTest/debug/RestExplorer-debug-androidTest.apk"
6969
- &salesforceReact-apk-path
7070
"libs/SalesforceReact/build/outputs/apk/androidTest/debug/SalesforceReact-debug-androidTest.apk"
7171

72-
7372
version: 2.1
7473
executors:
7574
linux:
@@ -125,7 +124,7 @@ jobs:
125124
parameters:
126125
lib:
127126
type: enum
128-
enum: ["SalesforceAnalytics", "SalesforceSDK", "SmartStore", "SmartSync", "SalesforceHybrid", "RestExplorer", "SalesforceReact"]
127+
enum: ["SalesforceAnalytics", "SalesforceSDK", "SmartStore", "MobileSync", "SalesforceHybrid", "RestExplorer", "SalesforceReact"]
129128
default: "SalesforceAnalytics"
130129
test_apk:
131130
type: string
@@ -166,7 +165,7 @@ jobs:
166165
./gradlew libs:SalesforceAnalytics:assembleAndroidTest
167166
./gradlew libs:SalesforceSDK:assembleAndroidTest
168167
./gradlew libs:SmartStore:assembleAndroidTest
169-
./gradlew libs:SmartSync:assembleAndroidTest
168+
./gradlew libs:MobileSync:assembleAndroidTest
170169
./gradlew libs:SalesforceHybrid:assembleAndroidTest
171170
./gradlew libs:SalesforceReact:assembleAndroidTest
172171
./gradlew native:NativeSampleApps:RestExplorer:assembleAndroidTest
@@ -245,7 +244,7 @@ jobs:
245244
./gradlew :libs:SalesforceAnalytics:assemble
246245
./gradlew :libs:SalesforceSDK:assemble
247246
./gradlew :libs:SmartStore:assemble
248-
./gradlew :libs:SmartSync:assemble
247+
./gradlew :libs:MobileSync:assemble
249248
./gradlew :libs:SalesforceHybrid:assemble
250249
./gradlew :libs:SalesforceReact:assemble
251250
when: always
@@ -259,7 +258,7 @@ jobs:
259258
path: libs/SmartStore/build/outputs/aar/
260259
destination: libraries
261260
- store_artifacts:
262-
path: libs/SmartSync/build/outputs/aar/
261+
path: libs/MobileSync/build/outputs/aar/
263262
destination: libraries
264263
- store_artifacts:
265264
path: libs/SalesforceHybrid/build/outputs/aar/
@@ -274,7 +273,7 @@ jobs:
274273
./gradlew :native:NativeSampleApps:AppConfigurator:assemble
275274
./gradlew :native:NativeSampleApps:ConfiguredApp:assemble
276275
./gradlew :native:NativeSampleApps:RestExplorer:assemble
277-
./gradlew :native:NativeSampleApps:SmartSyncExplorer:assemble
276+
./gradlew :native:NativeSampleApps:MobileSyncExplorer:assemble
278277
- store_artifacts:
279278
path: native/NativeSampleApps/AppConfigurator/build/outputs/apk/
280279
destination: native-apps
@@ -285,23 +284,23 @@ jobs:
285284
path: native/NativeSampleApps/RestExplorer/build/outputs/apk/
286285
destination: native-apps
287286
- store_artifacts:
288-
path: native/NativeSampleApps/SmartSyncExplorer/build/outputs/apk/
287+
path: native/NativeSampleApps/MobileSyncExplorer/build/outputs/apk/
289288
destination: native-apps
290289
- run:
291290
name: Build Hybrid Sample Apps
292291
when: always
293292
command: |
294293
./gradlew :hybrid:HybridSampleApps:AccountEditor:assemble
295294
./gradlew :hybrid:HybridSampleApps:NoteSync:assemble
296-
./gradlew :hybrid:HybridSampleApps:SmartSyncExplorerHybrid:assemble
295+
./gradlew :hybrid:HybridSampleApps:MobileSyncExplorerHybrid:assemble
297296
- store_artifacts:
298297
path: hybrid/HybridSampleApps/AccountEditor/build/outputs/apk/
299298
destination: hybrid-apps
300299
- store_artifacts:
301300
path: hybrid/HybridSampleApps/NoteSync/build/outputs/apk/
302301
destination: hybrid-apps
303302
- store_artifacts:
304-
path: hybrid/HybridSampleApps/SmartSyncExplorerHybrid/build/outputs/apk/
303+
path: hybrid/HybridSampleApps/MobileSyncExplorerHybrid/build/outputs/apk/
305304
destination: hybrid-apps
306305
- save_cache: *save-gradle-cache
307306

@@ -347,9 +346,9 @@ workflows:
347346
branches:
348347
only:
349348
- /pull.*/
350-
name: "SmartSync"
351-
lib: "SmartSync"
352-
test_apk: *smartSync-apk-path
349+
name: "MobileSync"
350+
lib: "MobileSync"
351+
test_apk: *mobileSync-apk-path
353352
pr: true
354353
- run-tests:
355354
filters:
@@ -384,11 +383,10 @@ workflows:
384383
# Monday 8 PM - API 28
385384
# Monday 9 PM - API 26
386385
# Monday 10 PM - API 24
387-
# Monday 11 PM - API 22
386+
# Monday 11 PM - API 29
388387
# Friday 8 PM - API 27
389388
# Friday 9 PM - API 25
390389
# Friday 10 PM - API 23
391-
# Friday 11 PM - API 21
392390
test-api-28:
393391
triggers:
394392
- schedule:
@@ -413,9 +411,9 @@ workflows:
413411
test_apk: *smartStore-apk-path
414412
api_level: 28
415413
- run-tests:
416-
name: "SmartSync API 28"
417-
lib: "SmartSync"
418-
test_apk: *smartSync-apk-path
414+
name: "MobileSync API 28"
415+
lib: "MobileSync"
416+
test_apk: *mobileSync-apk-path
419417
api_level: 28
420418
- run-tests:
421419
name: "SalesforceHybrid API 28"
@@ -456,9 +454,9 @@ workflows:
456454
test_apk: *smartStore-apk-path
457455
api_level: 26
458456
- run-tests:
459-
name: "SmartSync API 26"
460-
lib: "SmartSync"
461-
test_apk: *smartSync-apk-path
457+
name: "MobileSync API 26"
458+
lib: "MobileSync"
459+
test_apk: *mobileSync-apk-path
462460
api_level: 26
463461
- run-tests:
464462
name: "SalesforceHybrid API 26"
@@ -499,9 +497,9 @@ workflows:
499497
test_apk: *smartStore-apk-path
500498
api_level: 24
501499
- run-tests:
502-
name: "SmartSync API 24"
503-
lib: "SmartSync"
504-
test_apk: *smartSync-apk-path
500+
name: "MobileSync API 24"
501+
lib: "MobileSync"
502+
test_apk: *mobileSync-apk-path
505503
api_level: 24
506504
- run-tests:
507505
name: "SalesforceHybrid API 24"
@@ -519,49 +517,6 @@ workflows:
519517
test_apk: *salesforceReact-apk-path
520518
api_level: 24
521519

522-
test-api-22:
523-
triggers:
524-
- schedule:
525-
cron: "0 7 * * 2"
526-
filters:
527-
branches:
528-
only:
529-
- dev
530-
jobs:
531-
- run-tests:
532-
name: "SalesforceAnalytics API 22"
533-
api_level: 22
534-
- run-tests:
535-
name: "SalesforceSDK API 22"
536-
lib: "SalesforceSDK"
537-
test_apk: *coresdk-apk-path
538-
api_level: 22
539-
- run-tests:
540-
name: "SmartStore API 22"
541-
lib: "SmartStore"
542-
test_apk: *smartStore-apk-path
543-
api_level: 22
544-
- run-tests:
545-
name: "SmartSync API 22"
546-
lib: "SmartSync"
547-
test_apk: *smartSync-apk-path
548-
api_level: 22
549-
- run-tests:
550-
name: "SalesforceHybrid API 22"
551-
lib: "SalesforceHybrid"
552-
test_apk: *salesforceHybrid-apk-path
553-
api_level: 22
554-
- run-tests:
555-
name: "RestExplorer API 22"
556-
lib: "RestExplorer"
557-
test_apk: *restExplorer-apk-path
558-
api_level: 22
559-
- run-tests:
560-
name: "SalesforceReact API 22"
561-
lib: "SalesforceReact"
562-
test_apk: *salesforceReact-apk-path
563-
api_level: 22
564-
565520
test-api-27:
566521
triggers:
567522
- schedule:
@@ -585,9 +540,9 @@ workflows:
585540
test_apk: *smartStore-apk-path
586541
api_level: 27
587542
- run-tests:
588-
name: "SmartSync API 27"
589-
lib: "SmartSync"
590-
test_apk: *smartSync-apk-path
543+
name: "MobileSync API 27"
544+
lib: "MobileSync"
545+
test_apk: *mobileSync-apk-path
591546
api_level: 27
592547
- run-tests:
593548
name: "SalesforceHybrid API 27"
@@ -628,9 +583,9 @@ workflows:
628583
test_apk: *smartStore-apk-path
629584
api_level: 25
630585
- run-tests:
631-
name: "SmartSync API 25"
632-
lib: "SmartSync"
633-
test_apk: *smartSync-apk-path
586+
name: "MobileSync API 25"
587+
lib: "MobileSync"
588+
test_apk: *mobileSync-apk-path
634589
api_level: 25
635590
- run-tests:
636591
name: "SalesforceHybrid API 25"
@@ -671,9 +626,9 @@ workflows:
671626
test_apk: *smartStore-apk-path
672627
api_level: 23
673628
- run-tests:
674-
name: "SmartSync API 23"
675-
lib: "SmartSync"
676-
test_apk: *smartSync-apk-path
629+
name: "MobileSync API 23"
630+
lib: "MobileSync"
631+
test_apk: *mobileSync-apk-path
677632
api_level: 23
678633
- run-tests:
679634
name: "SalesforceHybrid API 23"
@@ -691,45 +646,45 @@ workflows:
691646
test_apk: *salesforceReact-apk-path
692647
api_level: 23
693648

694-
test-api-21:
649+
test-api-29:
695650
triggers:
696651
- schedule:
697-
cron: "0 7 * * 6"
652+
cron: "0 7 * * 2"
698653
filters:
699654
branches:
700655
only:
701656
- dev
702657
jobs:
703658
- run-tests:
704-
name: "SalesforceAnalytics API 21"
705-
api_level: 21
659+
name: "SalesforceAnalytics API 29"
660+
api_level: 29
706661
- run-tests:
707-
name: "SalesforceSDK API 21"
662+
name: "SalesforceSDK API 29"
708663
lib: "SalesforceSDK"
709664
test_apk: *coresdk-apk-path
710-
api_level: 21
665+
api_level: 29
711666
- run-tests:
712-
name: "SmartStore API 21"
667+
name: "SmartStore API 29"
713668
lib: "SmartStore"
714669
test_apk: *smartStore-apk-path
715-
api_level: 21
670+
api_level: 29
716671
- run-tests:
717-
name: "SmartSync API 21"
718-
lib: "SmartSync"
719-
test_apk: *smartSync-apk-path
720-
api_level: 21
672+
name: "MobileSync API 29"
673+
lib: "MobileSync"
674+
test_apk: *mobileSync-apk-path
675+
api_level: 29
721676
- run-tests:
722-
name: "SalesforceHybrid API 21"
677+
name: "SalesforceHybrid API 29"
723678
lib: "SalesforceHybrid"
724679
test_apk: *salesforceHybrid-apk-path
725-
api_level: 21
680+
api_level: 29
726681
- run-tests:
727-
name: "RestExplorer API 21"
682+
name: "RestExplorer API 29"
728683
lib: "RestExplorer"
729684
test_apk: *restExplorer-apk-path
730-
api_level: 21
685+
api_level: 29
731686
- run-tests:
732-
name: "SalesforceReact API 21"
687+
name: "SalesforceReact API 29"
733688
lib: "SalesforceReact"
734689
test_apk: *salesforceReact-apk-path
735-
api_level: 21
690+
api_level: 29

‎.circleci/gitChangedLibs.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'json'
22
require 'set'
33

4-
libsTopoSorted = ["SalesforceAnalytics", "SalesforceSDK", "SmartStore", "SmartSync", "SalesforceHybrid", "SalesforceReact", "RestExplorer"]
4+
libsTopoSorted = ["SalesforceAnalytics", "SalesforceSDK", "SmartStore", "MobileSync", "SalesforceHybrid", "SalesforceReact", "RestExplorer"]
55

66
$GITPRAPI = "https://api.github.com/repos/%s/SalesforceMobileSDK-android/pulls/%s/files"
77

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ This pulls submodule dependencies from github.
2323
Introduction
2424
==
2525

26-
### What's New in 7.3.0
27-
See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases/tag/v7.3.0).
26+
### What's New in 8.0.0
27+
See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases/tag/v8.0.0).
2828

2929
### Native Applications
3030
The Salesforce Mobile SDK provides essential libraries for quickly building native mobile apps that seamlessly integrate with the Salesforce cloud architecture. Out of the box, we provide an implementation of OAuth2, abstracting away the complexity of securely storing refresh tokens or fetching a new session ID when a session expires. The SDK also provides Java wrappers for the Salesforce REST API, making it easy to retrieve, store, and manipulate data.

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.5.0'
8+
classpath 'com.android.tools.build:gradle:3.5.3'
99
}
1010
}
1111

1212
allprojects {
1313
group = 'com.salesforce.mobilesdk'
14-
version = '7.3.0'
14+
version = '8.0.0'
1515
repositories {
1616
mavenLocal()
1717
maven {

‎external/shared

Submodule shared updated 87 files

‎gradle.properties

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
cdvCompileSdkVersion=android-28
2-
cdvMinSdkVersion=21
3-
cdvBuildToolsVersion=28.0.3
1+
cdvCompileSdkVersion=29
2+
cdvMinSdkVersion=23
43
android.useAndroidX=true
54
android.enableJetifier=true

0 commit comments

Comments
 (0)