Skip to content

Commit

Permalink
build: Improve iOS Demo app build configuration (#59791)
Browse files Browse the repository at this point in the history
* build: Remove unused package script

This script is not references anywhere and likely is now unnecessary
given the current Xcode version is Xcore 14.

wordpress-mobile/gutenberg-mobile@16c6a60

* 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.
```
  • Loading branch information
dcalhoun authored Mar 13, 2024
1 parent 86b166c commit fde2dd5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down Expand Up @@ -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)",
Expand Down
1 change: 0 additions & 1 deletion packages/react-native-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit fde2dd5

Please sign in to comment.