Skip to content

Commit

Permalink
Merge branch 'main' into 1009-fix-ruby-gems
Browse files Browse the repository at this point in the history
  • Loading branch information
f1sh1918 authored Apr 10, 2024
2 parents 46c4fdc + 7968498 commit cb786a8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .circleci/src/jobs/build_ios.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
macos:
xcode: 14.2.0
xcode: 15.2.0
resource_class: macos.m1.medium.gen1
environment:
FL_OUTPUT_DIR: output
Expand Down
2 changes: 1 addition & 1 deletion .circleci/src/jobs/deliver_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .circleci/src/jobs/promote_ios.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cb786a8

Please sign in to comment.