From a06d17f9da3b53a9a36cccaa95760d05e363ab1f Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 10 Apr 2024 10:12:31 +0200 Subject: [PATCH 1/2] 1017: upgrade to xcode 15 --- .circleci/config.yml | 6 +++--- .circleci/src/jobs/build_ios.yml | 2 +- .circleci/src/jobs/deliver_ios.yml | 2 +- .circleci/src/jobs/promote_ios.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f083ef89..85aea4a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -265,7 +265,7 @@ jobs: FL_OUTPUT_DIR: output TOTAL_CPUS: 4 macos: - xcode: 14.2.0 + xcode: 15.2.0 resource_class: macos.m1.medium.gen1 shell: /bin/bash --login -o pipefail steps: @@ -427,7 +427,7 @@ jobs: environment: FASTLANE_SKIP_UPDATE_CHECK: true macos: - xcode: 14.2.0 + xcode: 15.2.0 parameters: production_delivery: default: false @@ -553,7 +553,7 @@ jobs: environment: FASTLANE_SKIP_UPDATE_CHECK: true macos: - xcode: 14.2.0 + xcode: 15.2.0 shell: /bin/bash --login -o pipefail steps: - checkout diff --git a/.circleci/src/jobs/build_ios.yml b/.circleci/src/jobs/build_ios.yml index 0678b70c..d85e21d6 100644 --- a/.circleci/src/jobs/build_ios.yml +++ b/.circleci/src/jobs/build_ios.yml @@ -1,5 +1,5 @@ macos: - xcode: 14.2.0 + xcode: 15.2.0 resource_class: macos.m1.medium.gen1 environment: FL_OUTPUT_DIR: output diff --git a/.circleci/src/jobs/deliver_ios.yml b/.circleci/src/jobs/deliver_ios.yml index 1e98343f..ec2bbea7 100644 --- a/.circleci/src/jobs/deliver_ios.yml +++ b/.circleci/src/jobs/deliver_ios.yml @@ -6,7 +6,7 @@ parameters: type: boolean default: false macos: - xcode: 14.2.0 + xcode: 15.2.0 environment: FASTLANE_SKIP_UPDATE_CHECK: true shell: /bin/bash --login -o pipefail diff --git a/.circleci/src/jobs/promote_ios.yml b/.circleci/src/jobs/promote_ios.yml index b99e4b7f..862beaba 100644 --- a/.circleci/src/jobs/promote_ios.yml +++ b/.circleci/src/jobs/promote_ios.yml @@ -1,6 +1,6 @@ # Promotes the app from Testflight to the Apple App Store. macos: - xcode: 14.2.0 + xcode: 15.2.0 environment: FASTLANE_SKIP_UPDATE_CHECK: true shell: /bin/bash --login -o pipefail From 1c7c18b8577711507468266f5d6fe838b88430d3 Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 10 Apr 2024 10:53:58 +0200 Subject: [PATCH 2/2] 1017: add fix for ios build --- ios/Podfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/Podfile b/ios/Podfile index 10cceac1..ed5fac0f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -79,6 +79,8 @@ target 'Lunes' do installer.pods_project.targets.each do |target| target.build_configurations.each do |config| config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = "arm64" + # https://github.com/facebook/react-native/issues/37748 will be fixed with RN 0.72.5 + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'] end end # Signing on XCode 14 builds