From fde2dd507d97e61f90ee454745b17855cdbe0309 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Wed, 13 Mar 2024 14:44:39 -0400 Subject: [PATCH] build: Improve iOS Demo app build configuration (#59791) * build: Remove unused package script This script is not references anywhere and likely is now unnecessary given the current Xcode version is Xcore 14. https://github.com/wordpress-mobile/gutenberg-mobile/commit/16c6a60cda841747c8859f70a8cf3a02e480518d * build: Address iOS Demo app build warnings The `$(inherited)` value was added to address the following warnings. The additional `swift` path was added during subsequent app builds. ``` [!] The `GutenbergDemo [Debug]` target overrides the `LIBRARY_SEARCH_PATHS` build setting defined in `Pods/Target Support Files/Pods-GutenbergDemo/Pods-GutenbergDemo.debug.xcconfig'. This can lead to problems with the CocoaPods installation - Use the `$(inherited)` flag, or - Remove the build settings from the target. [!] The `GutenbergDemo [Release]` target overrides the `LIBRARY_SEARCH_PATHS` build setting defined in `Pods/Target Support Files/Pods-GutenbergDemo/Pods-GutenbergDemo.release.xcconfig'. This can lead to problems with the CocoaPods installation - Use the `$(inherited)` flag, or - Remove the build settings from the target. ``` --- .../ios/GutenbergDemo.xcodeproj/project.pbxproj | 12 ++++++++++-- packages/react-native-editor/package.json | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj index d030a192e1afd1..4b6938198c9423 100644 --- a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj +++ b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj @@ -617,7 +617,11 @@ INFOPLIST_FILE = GutenbergDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(PROJECT_DIR)"; + LIBRARY_SEARCH_PATHS = ( + "$(SDKROOT)/usr/lib/swift", + "$(inherited)", + "$(SDKROOT)/usr/lib/swift$(PROJECT_DIR)", + ); MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", @@ -651,7 +655,11 @@ INFOPLIST_FILE = GutenbergDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(PROJECT_DIR)"; + LIBRARY_SEARCH_PATHS = ( + "$(SDKROOT)/usr/lib/swift", + "$(inherited)", + "$(SDKROOT)/usr/lib/swift$(PROJECT_DIR)", + ); MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index a8c4f0fd2d4bf8..38d973b0a62abc 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -100,7 +100,6 @@ "preios": "cd ios && (bundle check > /dev/null || bundle install) && bundle exec pod install --repo-update", "preios:carthage": "cd ../react-native-aztec && npm run install-aztec-ios", "preios:carthage:update": "cd ../react-native-aztec && npm run update-aztec-ios", - "preios:xcode10": "cd ../../node_modules/react-native && ./scripts/ios-install-third-party.sh && cd third-party/glog-0.3.5 && [ -f libglog.pc ] || ../../scripts/ios-configure-glog.sh", "ios": "react-native run-ios", "ios:fast": "react-native run-ios", "device-tests": "cross-env NODE_ENV=test jest --forceExit --detectOpenHandles --no-cache --maxWorkers=3 --testPathIgnorePatterns='canary|gutenberg-editor-rendering' --config ./jest_ui.config.js",