Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1017: Upgrade xcode 15 #1018

Merged
merged 4 commits into from
Apr 10, 2024
+8 −6
Merged

1017: Upgrade xcode 15 #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a06d17f
1017: upgrade to xcode 15
f1sh1918 Apr 10, 2024
1c7c18b
1017: add fix for ios build
f1sh1918 Apr 10, 2024
6f4ed73
Merge branch 'main' into 1017-upgrade-xcode-15
f1sh1918 Apr 10, 2024
78d0dc5
Merge branch 'main' into 1017-upgrade-xcode-15
f1sh1918 Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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']
f1sh1918 marked this conversation as resolved.
Show resolved Hide resolved
end
end
# Signing on XCode 14 builds
Expand Down