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 Aug 31, 2023
2 parents 54bb750 + 9615478 commit 9fc31b4
Show file tree
Hide file tree
Showing 28 changed files with 238 additions and 110 deletions.
88 changes: 44 additions & 44 deletions .circleci/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.5)
CFPropertyList (3.0.6)
rexml
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.635.0)
aws-sdk-core (3.153.0)
aws-partitions (1.785.0)
aws-sdk-core (3.178.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.58.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (1.71.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.114.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-s3 (1.129.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.1.0)
Expand Down Expand Up @@ -52,14 +52,14 @@ GEM
danger (> 2.0)
ox (~> 2.0)
declarative (0.0.20)
digest-crc (0.6.4)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.92.5)
faraday (1.10.2)
excon (0.100.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -77,7 +77,7 @@ GEM
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-http-cache (2.4.1)
faraday-http-cache (2.5.0)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
Expand All @@ -89,8 +89,8 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.210.1)
fastimage (2.2.7)
fastlane (2.213.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -114,7 +114,7 @@ GEM
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (~> 2.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
plist (>= 3.1.0, < 4.0.0)
Expand All @@ -130,12 +130,12 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
git (1.12.0)
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
google-apis-androidpublisher_v3 (0.27.0)
google-apis-core (>= 0.7.2, < 2.a)
google-apis-core (0.9.0)
google-apis-androidpublisher_v3 (0.45.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -144,27 +144,27 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.14.0)
google-apis-core (>= 0.7.2, < 2.a)
google-apis-playcustomapp_v1 (0.10.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-storage_v1 (0.17.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.19.0)
google-apis-core (>= 0.9.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.0)
google-cloud-storage (1.42.0)
google-cloud-errors (1.3.1)
google-cloud-storage (1.44.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.17.0)
google-apis-storage_v1 (~> 0.19.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.2.0)
googleauth (1.6.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
Expand All @@ -175,18 +175,18 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.1)
json (2.6.2)
jwt (2.5.0)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.1)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
memoist (0.16.2)
mini_magick (4.11.0)
mini_magick (4.12.0)
mini_mime (1.1.2)
multi_json (1.15.0)
multipart-post (2.0.0)
multipart-post (2.3.0)
nanaimo (0.3.0)
nap (1.1.0)
naturally (2.2.1)
Expand All @@ -197,9 +197,9 @@ GEM
open4 (1.3.4)
optparse (0.1.1)
os (1.1.4)
ox (2.14.11)
plist (3.6.0)
public_suffix (5.0.0)
ox (2.14.14)
plist (3.7.0)
public_suffix (5.0.3)
rake (13.0.6)
rchardet (1.8.0)
representable (3.2.0)
Expand All @@ -220,7 +220,7 @@ GEM
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
simctl (1.6.10)
CFPropertyList
naturally
terminal-notifier (2.0.0)
Expand All @@ -236,7 +236,7 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
webrick (1.7.0)
webrick (1.8.1)
word_wrap (1.0.0)
xcodeproj (1.22.0)
CFPropertyList (>= 2.3.3, < 4.0)
Expand Down Expand Up @@ -264,4 +264,4 @@ DEPENDENCIES
xcpretty

BUNDLED WITH
2.2.3
2.3.26
38 changes: 13 additions & 25 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# Xcode version announcments can be found here: https://discuss.circleci.com/c/announcements/
# Each post contains a full image manifest, including iOS runtimes, devices, CocoaPods version, etc.
# NOTE: When updaing Xcode check the manifest for compatible chruby versions.
anchors:
- &latest-xcode "14.1.0"
- &latest-ios "16.1"
- &latest-xcode "14.3.1"
- &latest-ios "16.4"
- &min-ios "15.5"
- &requres-string "test << matrix.lib >> iOS 15.5" # Keep this version up to date
- &chruby "3.1.2"
- &device "iPhone 13"
- &requres-string "test << matrix.lib >> iOS 15.5" # Keep this min version up to date
- &device "iPhone SE (3rd generation)"
- &invalid ""

executors:
Expand All @@ -31,55 +29,45 @@ jobs:
ios:
type: string
default: *latest-ios
chruby:
type: string
default: *chruby
device:
type: string
default: *device
macos:
xcode: << parameters.xcode >>
resource_class: macos.x86.medium.gen2
working_directory: ~/SalesforceMobileSDK-iOS
shell: /bin/bash --login -eo pipefail
environment:
DEVICE: << parameters.device >>
IOS_VERSION: << parameters.ios >>
BASH_ENV: ~/.bashrc
FASTLANE_SKIP_UPDATE_CHECK: "true"
CHRUBY_VER: << parameters.chruby >>
LIB: << parameters.lib >>
NIGHTLY_TEST: << parameters.nightly-test >>
steps:
- checkout
- restore_cache:
keys:
- v8-gems-{{ checksum ".circleci/Gemfile.lock" }}
- v8-gems-
- v1-gem-cahce-{{ checksum ".circleci/Gemfile.lock" }}
- v1-gem-cahce
- run:
name: Install Dependencies
command: |
npm install [email protected]
./install.sh
./build/pre-build
chruby ${CHRUBY_VER}
cd .circleci
bundle check || sudo bundle install
sudo bundle update
bundle check || sudo bundle install --path vendor/bundle
- save_cache:
key: v8-gems-{{ checksum ".circleci/Gemfile.lock" }}
key: v1-gem-cahce{{ checksum ".circleci/Gemfile.lock" }}
paths:
- /Users/distiller/.gem/ruby/<< parameters.chruby >>
- vendor/bundle
- run:
name: Run Tests
command: |
chruby ${CHRUBY_VER}
cd .circleci
bundle exec fastlane PR lib:<< parameters.lib >>
- run:
name: Danger Lib
command: |
chruby ${CHRUBY_VER}
danger --dangerfile=.circleci/Dangerfile-Lib.rb --danger_id="${LIB}" --verbose
background: true
when: always
Expand All @@ -100,9 +88,6 @@ parameters:
ios:
type: string
default: *invalid
chruby:
type: string
default: *chruby
device:
type: string
default: *device
Expand All @@ -116,6 +101,7 @@ workflows:
- equal: [ "webhook", << pipeline.trigger_source >> ]
jobs:
- run-tests:
context: iOS Unit Tests
matrix:
parameters:
lib: ["SalesforceSDKCommon", "SalesforceAnalytics", "SalesforceSDKCore", "SmartStore", "MobileSync"]
Expand All @@ -134,13 +120,15 @@ workflows:
jobs:
- run-tests:
name: test << matrix.lib >> iOS << matrix.ios >>
context: iOS Unit Tests
matrix:
parameters:
lib: ["SalesforceSDKCommon", "SalesforceAnalytics", "SalesforceSDKCore", "SmartStore", "MobileSync"]
nightly-test: [true]
ios: [*min-ios]
- run-tests:
name: test << matrix.lib >> iOS << matrix.ios >>
context: iOS Unit Tests
matrix:
parameters:
lib: ["SalesforceSDKCommon", "SalesforceAnalytics", "SalesforceSDKCore", "SmartStore", "MobileSync"]
Expand All @@ -160,11 +148,11 @@ workflows:
jobs:
- run-tests:
name: test << matrix.lib >> iOS << matrix.ios >>
context: iOS Unit Tests
matrix:
parameters:
xcode: [<< pipeline.parameters.xcode >>]
ios: [<< pipeline.parameters.ios >>]
chruby: [<< pipeline.parameters.chruby >>]
device: [<< pipeline.parameters.device >>]
lib: ["SalesforceSDKCommon", "SalesforceAnalytics", "SalesforceSDKCore", "SmartStore", "MobileSync"]
nightly-test: [true]
Expand Down
2 changes: 1 addition & 1 deletion .circleci/fastlane/Fastfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$git_pr_api = "https://api.github.com/repos/%s/SalesforceMobileSDK-iOS/pulls/%s/files"
$schemes = ['SalesforceSDKCommon', 'SalesforceAnalytics', 'SalesforceSDKCore', 'SmartStore', 'MobileSync']
ENV['DEVICE'] = 'iPhone 13' unless ENV.has_key?('DEVICE')
ENV['DEVICE'] = 'iPhone SE (3rd generation)' unless ENV.has_key?('DEVICE')
ENV['IOS_VERSION'] = '15.5' unless ENV.has_key?('IOS_VERSION')

lane :PR do |options|
Expand Down
2 changes: 1 addition & 1 deletion MobileSync.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "MobileSync"
s.version = "11.0.0"
s.version = "11.1.0"
s.summary = "Salesforce Mobile SDK for iOS - MobileSync"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand Down
2 changes: 1 addition & 1 deletion SalesforceAnalytics.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "SalesforceAnalytics"
s.version = "11.0.0"
s.version = "11.1.0"
s.summary = "Salesforce Mobile SDK for iOS"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand Down
2 changes: 1 addition & 1 deletion SalesforceSDKCommon.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "SalesforceSDKCommon"
s.version = "11.0.0"
s.version = "11.1.0"
s.summary = "Salesforce Mobile SDK for iOS"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand Down
2 changes: 1 addition & 1 deletion SalesforceSDKCore.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "SalesforceSDKCore"
s.version = "11.0.0"
s.version = "11.1.0"
s.summary = "Salesforce Mobile SDK for iOS"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand Down
2 changes: 1 addition & 1 deletion SmartStore.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "SmartStore"
s.version = "11.0.0"
s.version = "11.1.0"
s.summary = "Salesforce Mobile SDK for iOS - SmartStore"
s.homepage = "https://github.com/forcedotcom/SalesforceMobileSDK-iOS"

Expand Down
2 changes: 1 addition & 1 deletion configuration/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 11.0.0
CURRENT_PROJECT_VERSION = 11.1.0
Loading

0 comments on commit 9fc31b4

Please sign in to comment.