Updated CI config to match the other iOS repos (#639)

* Update CI config

* Update Fastifle

.circleci/config.yml

@@ -8,11 +8,12 @@ executors:
  LANG: en_US.UTF-8
  BUNDLE_JOBS: 4
  BUNDLE_RETRY: 3
+ BUNDLE_PATH: vendor/bundle
  HOMEBREW_LOGS: ~/homebrew-logs
  HOMEBREW_TEMP: ~/homebrew-temp
  HOMEBREW_NO_AUTO_UPDATE: 1
- SCHEME: Lock
- DEVICE: iPhone 11
+ HOMEBREW_NO_INSTALL_CLEANUP: 1
+ FL_OUTPUT_DIR: output
  FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2
 
 commands:
@@ -50,21 +51,18 @@ commands:
  - lock-swift-carthage-{ checksum "Cartfile.resolved" }}-<< parameters.xcode >>
  - lock-swift-carthage-{ checksum "Cartfile.resolved" }}
  - lock-swift-carthage-
- - run: |
- bundle exec fastlane ios bootstrap
+ - run: bundle exec fastlane ios bootstrap
  - save_cache:
  key: lock-swift-carthage-{ checksum "Cartfile.resolved" }}-<< parameters.xcode >>
  paths:
  - Carthage/Build
 
  test:
  steps: 
- - run: |
- bundle exec fastlane ios ci
+ - run: bundle exec fastlane ios ci
  pod-lint:
  steps:
- - run: |
- bundle exec fastlane ios pod_lint
+ - run: bundle exec fastlane ios pod_lint
  send-coverage-report:
  steps:
  - run: bash <(curl -s https://codecov.io/bash) -J 'Lock'

Gemfile.lock

@@ -9,27 +9,27 @@ GEM
  tzinfo (~> 1.1)
  addressable (2.7.0)
  public_suffix (>= 2.0.2, < 5.0)
- algoliasearch (1.27.3)
+ algoliasearch (1.27.4)
  httpclient (~> 2.8, >= 2.8.3)
  json (>= 1.5.1)
  atomos (0.1.3)
  aws-eventstream (1.1.0)
- aws-partitions (1.341.0)
- aws-sdk-core (3.103.0)
+ aws-partitions (1.381.0)
+ aws-sdk-core (3.109.1)
  aws-eventstream (~> 1, >= 1.0.2)
  aws-partitions (~> 1, >= 1.239.0)
  aws-sigv4 (~> 1.1)
  jmespath (~> 1.0)
- aws-sdk-kms (1.36.0)
- aws-sdk-core (~> 3, >= 3.99.0)
+ aws-sdk-kms (1.39.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
  aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.74.0)
- aws-sdk-core (~> 3, >= 3.102.1)
+ aws-sdk-s3 (1.83.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
  aws-sdk-kms (~> 1)
  aws-sigv4 (~> 1.1)
- aws-sigv4 (1.2.1)
+ aws-sigv4 (1.2.2)
  aws-eventstream (~> 1, >= 1.0.2)
- babosa (1.0.3)
+ babosa (1.0.4)
  claide (1.0.3)
  cocoapods (1.9.3)
  activesupport (>= 4.0.2, < 5)
@@ -59,7 +59,7 @@ GEM
  netrc (~> 0.11)
  typhoeus (~> 1.0)
  cocoapods-deintegrate (1.0.4)
- cocoapods-downloader (1.3.0)
+ cocoapods-downloader (1.4.0)
  cocoapods-plugins (1.0.0)
  nap
  cocoapods-search (1.0.0)
@@ -72,7 +72,7 @@ GEM
  colored2 (3.1.2)
  commander-fastlane (4.4.6)
  highline (~> 1.7.2)
- concurrent-ruby (1.1.6)
+ concurrent-ruby (1.1.7)
  declarative (0.0.20)
  declarative-option (0.1.0)
  digest-crc (0.6.1)
@@ -84,16 +84,16 @@ GEM
  escape (0.0.4)
  ethon (0.12.0)
  ffi (>= 1.3.0)
- excon (0.75.0)
- faraday (0.17.3)
+ excon (0.76.0)
+ faraday (1.0.1)
  multipart-post (>= 1.2, < 3)
- faraday-cookie_jar (0.0.6)
- faraday (>= 0.7.4)
+ faraday-cookie_jar (0.0.7)
+ faraday (>= 0.8.0)
  http-cookie (~> 1.0.0)
- faraday_middleware (0.14.0)
- faraday (>= 0.7.4, < 1.0)
- fastimage (2.1.7)
- fastlane (2.152.0)
+ faraday_middleware (1.0.0)
+ faraday (~> 1.0)
+ fastimage (2.2.0)
+ fastlane (2.162.0)
  CFPropertyList (>= 2.3, < 4.0.0)
  addressable (>= 2.3, < 3.0.0)
  aws-sdk-s3 (~> 1.0)
@@ -104,9 +104,9 @@ GEM
  dotenv (>= 2.1.1, < 3.0.0)
  emoji_regex (>= 0.1, < 4.0)
  excon (>= 0.71.0, < 1.0.0)
- faraday (>= 0.17, < 1.0)
+ faraday (~> 1.0)
  faraday-cookie_jar (~> 0.0.6)
- faraday_middleware (>= 0.13.1, < 2.0)
+ faraday_middleware (~> 1.0)
  fastimage (>= 2.1.0, < 3.0.0)
  gh_inspector (>= 1.1.2, < 2.0.0)
  google-api-client (>= 0.37.0, < 0.39.0)
@@ -149,14 +149,14 @@ GEM
  google-cloud-env (1.3.3)
  faraday (>= 0.17.3, < 2.0)
  google-cloud-errors (1.0.1)
- google-cloud-storage (1.26.2)
+ google-cloud-storage (1.29.1)
  addressable (~> 2.5)
  digest-crc (~> 0.4)
  google-api-client (~> 0.33)
  google-cloud-core (~> 1.2)
  googleauth (~> 0.9)
  mini_mime (~> 1.0)
- googleauth (0.13.0)
+ googleauth (0.14.0)
  faraday (>= 0.17.3, < 2.0)
  jwt (>= 1.4, < 3.0)
  memoist (~> 0.16)
@@ -171,21 +171,21 @@ GEM
  concurrent-ruby (~> 1.0)
  jmespath (1.4.0)
  json (2.3.1)
- jwt (2.2.1)
+ jwt (2.2.2)
  memoist (0.16.2)
  mini_magick (4.10.1)
  mini_mime (1.0.2)
- minitest (5.14.1)
+ minitest (5.14.2)
  molinillo (0.6.6)
  multi_json (1.15.0)
  multipart-post (2.0.0)
- nanaimo (0.2.6)
+ nanaimo (0.3.0)
  nap (1.1.0)
  naturally (2.2.0)
  netrc (0.11.0)
- os (1.1.0)
+ os (1.1.1)
  plist (3.5.0)
- public_suffix (4.0.5)
+ public_suffix (4.0.6)
  rake (13.0.1)
  representable (3.0.4)
  declarative (< 0.1.0)
@@ -211,7 +211,7 @@ GEM
  unicode-display_width (~> 1.1, >= 1.1.1)
  thread_safe (0.3.6)
  tty-cursor (0.7.1)
- tty-screen (0.8.0)
+ tty-screen (0.8.1)
  tty-spinner (0.9.3)
  tty-cursor (~> 0.7)
  typhoeus (1.4.0)
@@ -224,12 +224,12 @@ GEM
  unf_ext (0.0.7.7)
  unicode-display_width (1.7.0)
  word_wrap (1.0.0)
- xcodeproj (1.17.0)
+ xcodeproj (1.19.0)
  CFPropertyList (>= 2.3.3, < 4.0)
  atomos (~> 0.1.3)
  claide (>= 1.0.2, < 2.0)
  colored2 (~> 3.1)
- nanaimo (~> 0.2.6)
+ nanaimo (~> 0.3.0)
  xcpretty (0.3.0)
  rouge (~> 2.0.7)
  xcpretty-travis-formatter (1.0.0)

fastlane/Fastfile

@@ -5,6 +5,10 @@ default_platform :ios
 
 platform :ios do
 
+ before_all do
+ setup_circle_ci
+ end
+
  desc "Installs dependencies using Carthage"
  lane :dependencies do |options|
  action = options[:action]
@@ -41,14 +45,8 @@ platform :ios do
  lane :ci do
  i18n(silent: true) # Generate base strings file
  # ensure_git_status_clean # Until we add dangerfile check if there are changes this way
- scheme = ENV["SCHEME"]
- UI.user_error!("You must supply a valid scheme in 'SCHEME' env variable") if scheme.nil?
- options = {
- scheme: scheme,
- device: ENV["DEVICE"]
- }
- test(options)
  lint
+ test
  end
 
  desc "Cocoapods library lint"

fastlane/Scanfile

@@ -1,6 +1,4 @@
 scheme "Lock"
-device "iPhone 8"
+device "iPhone 11"
 
 clean true
-
-output_types "html"