Skip to content

Commit 4c5b4fc

Browse files
committed
Merging dev into master
2 parents 0aa8303 + d7a769b commit 4c5b4fc

File tree

41 files changed

+1063
-147
lines changed

Some content is hidden

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

41 files changed

+1063
-147
lines changed

.circleci/config.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
orbs:
2+
codecov: codecov/[email protected]
3+
4+
15
# Xcode version announcments can be found here: https://discuss.circleci.com/c/announcements/
26
# Each post contains a full image manifest, including iOS runtimes, devices, CocoaPods version, etc.
37
anchors:
4-
- &latest-xcode "15.2"
5-
- &latest-ios "17.2"
8+
- &latest-xcode "15.3.0"
9+
- &latest-ios "17.4"
610
- &min-ios "16.4"
711
- &requres-string "test << matrix.lib >> iOS 16.4" # Keep this min version up to date
812
- &device "iPhone-SE-3rd-generation"
@@ -34,7 +38,7 @@ jobs:
3438
default: *device
3539
macos:
3640
xcode: << parameters.xcode >>
37-
resource_class: macos.x86.medium.gen2
41+
resource_class: macos.m1.medium.gen1
3842
working_directory: ~/SalesforceMobileSDK-iOS
3943
environment:
4044
DEVICE: << parameters.device >>
@@ -58,6 +62,7 @@ jobs:
5862
cd .circleci
5963
bundle check || sudo bundle install --path vendor/bundle
6064
brew install xcbeautify
65+
mkdir -p ~/.gnupg
6166
- save_cache:
6267
key: v1-gem-cahce{{ checksum ".circleci/Gemfile.lock" }}
6368
paths:
@@ -66,14 +71,16 @@ jobs:
6671
name: Run Tests
6772
command: |
6873
cd .circleci
69-
bundle exec fastlane PR lib:<< parameters.lib >>
74+
fastlane PR lib:<< parameters.lib >>
7075
no_output_timeout: 20m
7176
- run:
7277
name: Danger Lib
7378
command: |
7479
danger --dangerfile=.circleci/Dangerfile-Lib.rb --danger_id="${LIB}" --verbose
7580
background: true
7681
when: always
82+
- codecov/upload:
83+
flags: << parameters.lib >>
7784
- store_test_results:
7885
path: /Users/distiller/SalesforceMobileSDK-iOS/test_output/
7986
- store_artifacts:

.codecov.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Validate changes to this class with: curl -X POST --data-binary @.codecov.yml https://codecov.io/validate
2+
3+
codecov:
4+
branch: dev
5+
6+
coverage:
7+
precision: 2
8+
round: down
9+
range: "25...75"
10+
11+
status:
12+
project:
13+
default: false # disable the default status that measures entire project
14+
SalesforceAnalytics:
15+
target: auto
16+
paths:
17+
- "libs/SalesforceAnalytics/SalesforceAnalytics/"
18+
flags:
19+
- SalesforceAnalytics
20+
SalesforceSDKCommon:
21+
target: auto
22+
paths:
23+
- "libs/SalesforceSDKCore/SalesforceSDKCommon/"
24+
flags:
25+
- SalesforceSDKCommon
26+
SalesforceSDKCore:
27+
target: auto
28+
paths:
29+
- "libs/SalesforceSDKCore/SalesforceSDKCore/"
30+
flags:
31+
- SalesforceSDKCore
32+
SmartStore:
33+
target: auto
34+
paths:
35+
- "libs/SmartStore/SmartStore/"
36+
flags:
37+
- SmartStore
38+
MobileSync:
39+
target: auto
40+
paths:
41+
- "libs/MobileSync/MobileSync/"
42+
flags:
43+
- MobileSync
44+
45+
ignore:
46+
- "shared"
47+
- "native"
48+
- "libs/**/*Test*/*"
49+
50+
flag_management:
51+
default_rules: # the rules that will be followed for any flag added, generally
52+
carryforward: true
53+
54+
comment:
55+
layout: "diff, flags, files"
56+
behavior: default
57+
require_changes: false

MobileSync.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "MobileSync"
4-
s.version = "12.0.1"
4+
s.version = "12.1.0"
55
s.summary = "Salesforce Mobile SDK for iOS - MobileSync"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

SalesforceAnalytics.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SalesforceAnalytics"
4-
s.version = "12.0.1"
4+
s.version = "12.1.0"
55
s.summary = "Salesforce Mobile SDK for iOS"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

SalesforceSDKCommon.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SalesforceSDKCommon"
4-
s.version = "12.0.1"
4+
s.version = "12.1.0"
55
s.summary = "Salesforce Mobile SDK for iOS"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

SalesforceSDKCore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SalesforceSDKCore"
4-
s.version = "12.0.1"
4+
s.version = "12.1.0"
55
s.summary = "Salesforce Mobile SDK for iOS"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

SmartStore.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "SmartStore"
4-
s.version = "12.0.1"
4+
s.version = "12.1.0"
55
s.summary = "Salesforce Mobile SDK for iOS - SmartStore"
66
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"
77

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
2121

2222
smartstore.dependency 'SalesforceSDKCore', "~>#{s.version}"
2323
smartstore.dependency 'FMDB/SQLCipher', '~> 2.7.10'
24-
smartstore.dependency 'SQLCipher', '~> 4.5.7'
24+
smartstore.dependency 'SQLCipher', '~> 4.6.0'
2525
smartstore.source_files = 'libs/SmartStore/SmartStore/Classes/**/*.{h,m,swift}', 'libs/SmartStore/SmartStore/SmartStore.h'
2626
smartstore.public_header_files = 'libs/SmartStore/SmartStore/Classes/SFAlterSoupLongOperation.h', 'libs/SmartStore/SmartStore/Classes/SFQuerySpec.h', 'libs/SmartStore/SmartStore/Classes/SFSDKSmartStoreLogger.h', 'libs/SmartStore/SmartStore/Classes/SFSDKStoreConfig.h', 'libs/SmartStore/SmartStore/Classes/SFSmartSqlHelper.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStore.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStoreDatabaseManager.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStoreInspectorViewController.h', 'libs/SmartStore/SmartStore/Classes/SFSmartStoreUtils.h', 'libs/SmartStore/SmartStore/Classes/SFSoupIndex.h', 'libs/SmartStore/SmartStore/Classes/SFStoreCursor.h', 'libs/SmartStore/SmartStore/SmartStore.h', 'libs/SmartStore/SmartStore/Classes/SmartStoreSDKManager.h'
2727
smartstore.prefix_header_contents = '#import "SFSDKSmartStoreLogger.h"', '#import <SalesforceSDKCore/SalesforceSDKConstants.h>'

configuration/Version.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CURRENT_PROJECT_VERSION = 12.0.1
1+
CURRENT_PROJECT_VERSION = 12.1.0

0 commit comments

Comments
 (0)