From 1b10410715d6f90becb2cfc53824060fcbb754dd Mon Sep 17 00:00:00 2001 From: Andrea Date: Mon, 27 Mar 2023 15:58:21 +0200 Subject: [PATCH] chore: [IOAPPFD0-61] CircleCI iOS build upgraded to use xCode 14.2.0 (#4481) ## Short description This PR updates the CircleCI iOS build to use xCode `14.2.0` and be compliant with Apple App policies, requiring applications to be developed with the latest SDK starting from the 1st of April 2023 ## List of changes proposed in this pull request - xCode version upgraded from `13.4.1` to `14.2.0` (an extra brew command has been added in order to force the MacOS image to have up-to-date gem for cocoapods - otherwise the command is not found and the pod dependencies are not installed) - ruby version upgraded from `2.7.6` to `2.7.7` (since the circleCI MacOS image does not have the `2.7.6`) - Cocoapods version upgraded from `1.11.3` to `1.12.0` (following `2.7.7` ruby) - detox E2E simulator device upgraded form `iPhone 12 Max Pro` to `iPhone 14 Max Pro` (since xCode 14.2 does not come with the iPhone 12 Max Pro) --------- Co-authored-by: Fabio Bombardi <16268789+shadowsheep1@users.noreply.github.com> --- .circleci/config.yml | 8 +++++--- .detoxrc.json | 2 +- .ruby-version | 2 +- Gemfile | 4 ++-- Gemfile.lock | 22 ++++++++++------------ ios/Podfile.lock | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a280af2654..227bac9a75c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ defaults_android: &defaults_android defaults_macos: &defaults_macos <<: *defaults macos: - xcode: "13.4.1" + xcode: "14.2.0" resource_class: macos.x86.medium.gen2 working_directory: /Users/distiller/italia-app environment: @@ -287,12 +287,12 @@ jobs: cd ruby-install-0.8.5/ sudo make install - - run: ruby-install ruby 2.7.6 + - run: ruby-install ruby 2.7.7 - run: name: Set chruby command: | echo 'source /usr/local/share/chruby/chruby.sh' >> $BASH_ENV - echo 'chruby ruby-2.7.6' >> $BASH_ENV + echo 'chruby ruby-2.7.7' >> $BASH_ENV - run: name: Configure Bundler @@ -354,6 +354,7 @@ jobs: - run: name: Configure Bundler command: | + sudo gem update --system echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV source $BASH_ENV gem install bundler:$BUNDLER_VERSION @@ -442,6 +443,7 @@ jobs: - run: name: Configure Bundler command: | + sudo gem update --system echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV source $BASH_ENV gem install bundler:$BUNDLER_VERSION diff --git a/.detoxrc.json b/.detoxrc.json index b9a80d7fa98..0780725e792 100644 --- a/.detoxrc.json +++ b/.detoxrc.json @@ -17,7 +17,7 @@ "simulator": { "type": "ios.simulator", "device": { - "type": "iPhone 12 Pro Max" + "type": "iPhone 14 Pro Max" } } }, diff --git a/.ruby-version b/.ruby-version index 49cdd668e1c..1f7da99d4e1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.6 +2.7.7 diff --git a/Gemfile b/Gemfile index 86ac4209e2f..fe55c8294f8 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby '2.7.6' +ruby '2.7.7' -gem "cocoapods", "1.11.3" +gem "cocoapods", "1.12.0" gem "fastlane", "~> 2.210.0" diff --git a/Gemfile.lock b/Gemfile.lock index 15833192fbc..fa62a906f95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,12 +3,11 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (6.1.7.3) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) @@ -34,15 +33,15 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) - cocoapods (1.11.3) + cocoapods (1.12.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) + cocoapods-core (= 1.12.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -50,10 +49,10 @@ GEM gh_inspector (~> 1.0) molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) + ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.3) - activesupport (>= 5.0, < 7) + cocoapods-core (1.12.0) + activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -271,17 +270,16 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - zeitwerk (2.6.7) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.11.3) + cocoapods (= 1.12.0) fastlane (~> 2.210.0) RUBY VERSION - ruby 2.7.6p219 + ruby 2.7.7p221 BUNDLED WITH 2.1.4 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1f5e475c808..b35c2d3e423 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1008,4 +1008,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 0d78c2a7f58353c7eed2163b7e3b3747b00ff101 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.0