Merge pull request #3003 from digitalfabrik/2558-Upgrade-Xcode

2558: Upgrade to Xcode 16
digitalfabrik · Feb 19, 2025 · 0ebb7e6 · 0ebb7e6
2 parents baae2e2 + 20ab762
commit 0ebb7e6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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
@@ -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
@@ -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

diff --git a/.circleci/src/jobs/build_ios.yml b/.circleci/src/jobs/build_ios.yml
@@ -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

diff --git a/.circleci/src/jobs/deliver_ios.yml b/.circleci/src/jobs/deliver_ios.yml
@@ -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

diff --git a/.circleci/src/jobs/promote_ios.yml b/.circleci/src/jobs/promote_ios.yml
@@ -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

diff --git a/native/ios/Integreat.xcodeproj/project.pbxproj b/native/ios/Integreat.xcodeproj/project.pbxproj
@@ -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 = (
 			);
@@ -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;

diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock
@@ -1794,7 +1794,7 @@ SPEC CHECKSUMS:
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   TextToSpeech: 2b930ec3756afde499061f4f01ea895e1f75dccb
-  Yoga: 33622183a85805e12703cd618b2c16bfd18bfffb
+  Yoga: 1ab23c1835475da69cf14e211a560e73aab24cb0
 
 PODFILE CHECKSUM: c4a732e94b53059c604cf075a22ab8a90d83e317