From 76811f1d10dd5720074f611e7a7040b691518da9 Mon Sep 17 00:00:00 2001 From: LeandraH Date: Sat, 23 Nov 2024 18:13:10 +0100 Subject: [PATCH 1/5] 2558: Remove Mapbox workaround --- .../ios/Integreat.xcodeproj/project.pbxproj | 34 +++++++++---------- native/ios/Podfile.lock | 16 ++++----- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/native/ios/Integreat.xcodeproj/project.pbxproj b/native/ios/Integreat.xcodeproj/project.pbxproj index 3191ad821b..5fc28d9ab8 100644 --- a/native/ios/Integreat.xcodeproj/project.pbxproj +++ b/native/ios/Integreat.xcodeproj/project.pbxproj @@ -240,7 +240,6 @@ 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 */, @@ -353,23 +352,6 @@ shellPath = /bin/sh; shellScript = "../node_modules/react-native/scripts/react-native-xcode.sh index.ts\n"; }; - 2E4AEEB92AFD3D4800365635 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 8; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ); - 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"; - }; 3EB1174C3D3480DB5255939B /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -633,6 +615,22 @@ " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", ); INFOPLIST_FILE = Integreat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock index 52e8e1b1d7..d42876ec44 100644 --- a/native/ios/Podfile.lock +++ b/native/ios/Podfile.lock @@ -1022,7 +1022,7 @@ PODS: - react-native-static-server (0.5.5): - GCDWebServer (~> 3.0) - React - - react-native-webview (13.12.2): + - react-native-webview (13.13.0): - DoubleConversion - glog - hermes-engine @@ -1405,7 +1405,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - RNSentry (5.31.1): + - RNSentry (5.33.2): - DoubleConversion - glog - hermes-engine @@ -1428,7 +1428,7 @@ PODS: - ReactCommon/turbomodule/core - Sentry/HybridSDK (= 8.36.0) - Yoga - - RNSVG (15.6.0): + - RNSVG (15.7.1): - React-Core - Sentry/HybridSDK (8.36.0) - SocketRocket (0.7.0) @@ -1475,7 +1475,7 @@ DEPENDENCIES: - react-native-pdf (from `../node_modules/react-native-pdf`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - "react-native-static-server (from `../node_modules/@dr.pogodin/react-native-static-server`)" - - react-native-webview (from `../node_modules/react-native-webview`) + - "react-native-webview (from `../node_modules/@dr.pogodin/react-native-webview`)" - React-nativeconfig (from `../node_modules/react-native/ReactCommon`) - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) @@ -1610,7 +1610,7 @@ EXTERNAL SOURCES: react-native-static-server: :path: "../node_modules/@dr.pogodin/react-native-static-server" react-native-webview: - :path: "../node_modules/react-native-webview" + :path: "../node_modules/@dr.pogodin/react-native-webview" React-nativeconfig: :path: "../node_modules/react-native/ReactCommon" React-NativeModulesApple: @@ -1738,7 +1738,7 @@ SPEC CHECKSUMS: react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c react-native-safe-area-context: ab8f4a3d8180913bd78ae75dd599c94cce3d5e9a react-native-static-server: 9bb6c921baf4f2ad7e84832b82fa0eb5fe57c9f0 - react-native-webview: 3567d1249c79d092d6bec900ab8eadf03769576c + react-native-webview: 85f0387441372c2d3209d86c281e80451e7f18c9 React-nativeconfig: f326487bc61eba3f0e328da6efb2711533dcac46 React-NativeModulesApple: d89733f5baed8b9249ca5a8e497d63c550097312 React-perflogger: ed4e0c65781521e0424f2e5e40b40cc7879d737e @@ -1774,8 +1774,8 @@ SPEC CHECKSUMS: RNPermissions: 829cceec018e0821e4883a8a7cf51a7bb2d0d30a RNReanimated: f8dc6e880959a874d8d65c1e1fcdc29c946b9fea RNScreens: db442e7b8c7bc8befec2ce057927305ff8598cc8 - RNSentry: 09c5679c6b4e84f64f99ef14f6eb759eec5063a5 - RNSVG: 5da7a24f31968ec74f0b091e3440080f347e279b + RNSentry: 6da4c3b6959bc67125ad550f474e0bae308ce7c8 + RNSVG: 4590aa95758149fa27c5c83e54a6a466349a1688 Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d Yoga: 1ab23c1835475da69cf14e211a560e73aab24cb0 From 2d56832ba140d91a6806586af9f35837e3f6e552 Mon Sep 17 00:00:00 2001 From: LeandraH Date: Tue, 4 Feb 2025 14:24:55 +0100 Subject: [PATCH 2/5] 2558: Ugrade to Xcode 16 on CircleCI --- .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 d56df8a7ec..f9fe959ae6 100644 --- 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 index d7cd4d0592..62cbdb2d4f 100644 --- 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 index 311e201c8b..9e9f29d3bf 100644 --- 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 index 7e8ec08bc7..e6f4e2a405 100644 --- 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 From ddeb1153cdb6095c7a50ab4e81b255be4d83309c Mon Sep 17 00:00:00 2001 From: LeandraH Date: Wed, 5 Feb 2025 16:12:22 +0100 Subject: [PATCH 3/5] 2558: Put the workaround for Xcode 15 back in. --- .../ios/Integreat.xcodeproj/project.pbxproj | 34 +++++++++++++++++++ native/ios/Podfile.lock | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/native/ios/Integreat.xcodeproj/project.pbxproj b/native/ios/Integreat.xcodeproj/project.pbxproj index 5fc28d9ab8..483c46ab88 100644 --- a/native/ios/Integreat.xcodeproj/project.pbxproj +++ b/native/ios/Integreat.xcodeproj/project.pbxproj @@ -243,6 +243,7 @@ 3EB1174C3D3480DB5255939B /* [CP] Embed Pods Frameworks */, A24542B36A5D38264B91AF72 /* [CP] Copy Pods Resources */, 57C28A020DB9B52A6ABACDFB /* [CP-User] [RNFB] Core Configuration */, + 2E4AEEB92AFD3D4800365635 /* ShellScript */, ); buildRules = ( ); @@ -352,6 +353,23 @@ shellPath = /bin/sh; shellScript = "../node_modules/react-native/scripts/react-native-xcode.sh index.ts\n"; }; + 2E4AEEB92AFD3D4800365635 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 8; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + 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"; + }; 3EB1174C3D3480DB5255939B /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -631,6 +649,22 @@ " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", + " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", ); INFOPLIST_FILE = Integreat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock index 8a1d24d0a2..0890e82db5 100644 --- a/native/ios/Podfile.lock +++ b/native/ios/Podfile.lock @@ -1784,7 +1784,7 @@ SPEC CHECKSUMS: Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d TextToSpeech: 2b930ec3756afde499061f4f01ea895e1f75dccb - Yoga: 33622183a85805e12703cd618b2c16bfd18bfffb + Yoga: 1ab23c1835475da69cf14e211a560e73aab24cb0 PODFILE CHECKSUM: c4a732e94b53059c604cf075a22ab8a90d83e317 From 514267850c0b95904e5d0bb775e2bfba2daf9b90 Mon Sep 17 00:00:00 2001 From: LeandraH Date: Wed, 5 Feb 2025 17:56:09 +0100 Subject: [PATCH 4/5] 2558: Update the workaround for Xcode >= 15 --- native/ios/Integreat.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/ios/Integreat.xcodeproj/project.pbxproj b/native/ios/Integreat.xcodeproj/project.pbxproj index 483c46ab88..26cd884f03 100644 --- a/native/ios/Integreat.xcodeproj/project.pbxproj +++ b/native/ios/Integreat.xcodeproj/project.pbxproj @@ -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; From 21c82eddbdb4831255749c128ed910357c1240ae Mon Sep 17 00:00:00 2001 From: LeandraH Date: Wed, 5 Feb 2025 18:13:28 +0100 Subject: [PATCH 5/5] 2558: Clean up --- native/ios/Integreat.xcodeproj/project.pbxproj | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/native/ios/Integreat.xcodeproj/project.pbxproj b/native/ios/Integreat.xcodeproj/project.pbxproj index 26cd884f03..70732f1886 100644 --- a/native/ios/Integreat.xcodeproj/project.pbxproj +++ b/native/ios/Integreat.xcodeproj/project.pbxproj @@ -649,22 +649,6 @@ " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", - " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers", - " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", - " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers", - " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios", - " ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx", - " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", - " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", - " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", - " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers", - " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", - " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers", - " ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios", - " ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx", - " ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", - " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", - " ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", ); INFOPLIST_FILE = Integreat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0;