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

2558: Upgrade to Xcode 16 #3003

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

2558: Upgrade to Xcode 16 #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76811f1
2558: Remove Mapbox workaround
LeandraH Nov 23, 2024
fe53b9f
Merge branch 'main' into 2558-Upgrade-Xcode
LeandraH Feb 4, 2025
2d56832
2558: Ugrade to Xcode 16 on CircleCI
LeandraH Feb 4, 2025
ddeb115
2558: Put the workaround for Xcode 15 back in.
LeandraH Feb 5, 2025
5142678
2558: Update the workaround for Xcode >= 15
LeandraH Feb 5, 2025
21c82ed
2558: Clean up
LeandraH Feb 5, 2025
b36a8f5
Merge branch 'main' into 2558-Upgrade-Xcode
LeandraH Feb 5, 2025
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 @@ -346,7 +346,7 @@ jobs:
FL_OUTPUT_DIR: output
TOTAL_CPUS: 4
macos:
xcode: 15.3.0
xcode: 16.2.0
parameters:
build_config_name:
default: integreat
Expand Down Expand Up @@ -573,7 +573,7 @@ jobs:
environment:
FASTLANE_SKIP_UPDATE_CHECK: true
macos:
xcode: 15.3.0
xcode: 16.2.0
parameters:
build_config_name:
default: integreat
Expand Down Expand Up @@ -907,7 +907,7 @@ jobs:
environment:
FASTLANE_SKIP_UPDATE_CHECK: true
macos:
xcode: 15.3.0
xcode: 16.2.0
parameters:
build_config_name:
default: integreat
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
Expand Up @@ -4,7 +4,7 @@ parameters:
enum: [integreat, malte, integreat-e2e, integreat-test-cms, aschaffenburg]
default: integreat
macos:
xcode: 15.3.0
xcode: 16.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 @@ -8,7 +8,7 @@ parameters:
description: Whether to deliver the build to production.
type: boolean
macos:
xcode: 15.3.0
xcode: 16.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
Expand Up @@ -5,7 +5,7 @@ parameters:
enum: [integreat, malte, aschaffenburg]
default: integreat
macos:
xcode: 15.3.0
xcode: 16.2.0
environment:
FASTLANE_SKIP_UPDATE_CHECK: true
shell: /bin/bash --login -o pipefail
Expand Down
4 changes: 2 additions & 2 deletions native/ios/Integreat.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@
13B07F8C1A680F5B00A75B9A /* Frameworks */,
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
2E4AEEB92AFD3D4800365635 /* ShellScript */,
3EB1174C3D3480DB5255939B /* [CP] Embed Pods Frameworks */,
A24542B36A5D38264B91AF72 /* [CP] Copy Pods Resources */,
57C28A020DB9B52A6ABACDFB /* [CP-User] [RNFB] Core Configuration */,
2E4AEEB92AFD3D4800365635 /* ShellScript */,
);
buildRules = (
);
Expand Down Expand Up @@ -368,7 +368,7 @@
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
shellScript = "# Workaround for Mapbox ios certificates issue - https://stackoverflow.com/questions/77397157\n if [ \"$XCODE_VERSION_MAJOR\" = \"1500\" ]; then\n echo \"Remove signature files (Xcode 15 workaround)\"\n\n rm \"$BUILD_DIR/Release-iphoneos/Mapbox.xcframework-ios.signature\"\n fi\n";
shellScript = "# Workaround for Mapbox ios certificates issue - https://stackoverflow.com/questions/77397157\n if [ \"$XCODE_VERSION_MAJOR\" -ge \"1500\" ]; then\n echo \"Remove signature files (Xcode 15 workaround)\"\n\n rm \"$BUILD_DIR/Release-iphoneos/Mapbox.xcframework-ios.signature\"\n fi\n";
};
3EB1174C3D3480DB5255939B /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
2 changes: 1 addition & 1 deletion native/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,7 @@ SPEC CHECKSUMS:
Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
TextToSpeech: 2b930ec3756afde499061f4f01ea895e1f75dccb
Yoga: 33622183a85805e12703cd618b2c16bfd18bfffb
Yoga: 1ab23c1835475da69cf14e211a560e73aab24cb0

PODFILE CHECKSUM: c4a732e94b53059c604cf075a22ab8a90d83e317

Expand Down
Loading