Skip to content

Commit d70f9b8

Browse files
fix: ios build on EAS
1 parent 579927a commit d70f9b8

File tree

3 files changed

+36
-5
lines changed

3 files changed

+36
-5
lines changed

examples/default/ios/InstabugExample.xcodeproj/project.pbxproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,10 @@
686686
"-DFOLLY_MOBILE=1",
687687
"-DFOLLY_USE_LIBCPP=1",
688688
);
689-
OTHER_LDFLAGS = "$(inherited) ";
689+
OTHER_LDFLAGS = (
690+
"$(inherited)",
691+
" ",
692+
);
690693
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
691694
SDKROOT = iphoneos;
692695
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -758,7 +761,10 @@
758761
"-DFOLLY_MOBILE=1",
759762
"-DFOLLY_USE_LIBCPP=1",
760763
);
761-
OTHER_LDFLAGS = "$(inherited) ";
764+
OTHER_LDFLAGS = (
765+
"$(inherited)",
766+
" ",
767+
);
762768
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
763769
SDKROOT = iphoneos;
764770
USE_HERMES = true;

examples/default/ios/Podfile.lock

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,27 @@ PODS:
3232
- hermes-engine/Pre-built (= 0.75.4)
3333
- hermes-engine/Pre-built (0.75.4)
3434
- Instabug (14.0.0)
35+
- instabug-reactnative-ndk (0.1.0):
36+
- DoubleConversion
37+
- glog
38+
- hermes-engine
39+
- RCT-Folly (= 2024.01.01.00)
40+
- RCTRequired
41+
- RCTTypeSafety
42+
- React-Core
43+
- React-debug
44+
- React-Fabric
45+
- React-featureflags
46+
- React-graphics
47+
- React-ImageManager
48+
- React-NativeModulesApple
49+
- React-RCTFabric
50+
- React-rendererdebug
51+
- React-utils
52+
- ReactCodegen
53+
- ReactCommon/turbomodule/bridging
54+
- ReactCommon/turbomodule/core
55+
- Yoga
3556
- OCMock (3.9.4)
3657
- RCT-Folly (2024.01.01.00):
3758
- boost
@@ -1726,6 +1747,7 @@ DEPENDENCIES:
17261747
- fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
17271748
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
17281749
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
1750+
- instabug-reactnative-ndk (from `../node_modules/instabug-reactnative-ndk`)
17291751
- OCMock
17301752
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
17311753
- RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -1821,6 +1843,8 @@ EXTERNAL SOURCES:
18211843
hermes-engine:
18221844
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
18231845
:tag: hermes-2024-08-15-RNv0.75.1-4b3bf912cc0f705b51b71ce1a5b8bd79b93a451b
1846+
instabug-reactnative-ndk:
1847+
:path: "../node_modules/instabug-reactnative-ndk"
18241848
RCT-Folly:
18251849
:podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
18261850
RCTDeprecation:
@@ -1970,6 +1994,7 @@ SPEC CHECKSUMS:
19701994
GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
19711995
hermes-engine: ea92f60f37dba025e293cbe4b4a548fd26b610a0
19721996
Instabug: a0beffc01658773e2fac549845782f8937707dc4
1997+
instabug-reactnative-ndk: d765ac289d56e8896398d02760d9abf2562fc641
19731998
OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
19741999
RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
19752000
RCTDeprecation: 726d24248aeab6d7180dac71a936bbca6a994ed1

plugins/withIosSourcemaps.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ const { withXcodeProject } = require('@expo/config-plugins');
33
const BUILD_PHASE = 'PBXShellScriptBuildPhase';
44

55
function withIosPlugin(config) {
6-
return withXcodeProject(config, (config) => {
7-
const xcodeProject = config.modResults;
6+
return withXcodeProject(config, (xcodeConfig) => {
7+
const xcodeProject = xcodeConfig.modResults;
88

99
const bundleReactNativePhase = xcodeProject.pbxItemByComment(
1010
'Bundle React Native code and images',
@@ -21,7 +21,7 @@ function withIosPlugin(config) {
2121
if (uploadSourcemapPhase) {
2222
uploadSourcemapPhase.shellScript = addSourceMapExport(uploadSourcemapPhase.shellScript);
2323
}
24-
return config;
24+
return xcodeConfig;
2525
});
2626
}
2727

0 commit comments

Comments
 (0)