Skip to content

Commit 538f5d4

Browse files
alwxalwx
committed
Fixes
1 parent 980c5a5 commit 538f5d4

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

‎packages/core/RNSentry.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if should_use_folly_flags(rn_version)
1515
folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
1616
else
1717
# For RN 0.80+, don't use the incompatible Folly flags
18-
folly_compiler_flags = ''
18+
folly_compiler_flags = ' -DFOLLY_CFG_NO_COROUTINES=1'
1919
end
2020

2121
is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] == "1"

‎samples/react-native/ios/Podfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@ linkage = ENV['USE_FRAMEWORKS']
1212
if linkage != nil
1313
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
1414
use_frameworks! :linkage => linkage.to_sym
15+
16+
pre_install do |installer|
17+
installer.pod_targets.each do |pod|
18+
# RNScreens and RNReanimated don't work when dynamically linked
19+
# Fix from https://github.com/software-mansion/react-native-screens/issues/1963#issuecomment-1848246731
20+
if pod.name.eql?('RNReanimated') || pod.name.eql?('RNScreens')
21+
def pod.build_type;
22+
Pod::BuildType.static_library
23+
end
24+
end
25+
end
26+
end
1527
end
1628

1729
target 'sentryreactnativesample' do

‎samples/react-native/ios/sentryreactnativesample.xcodeproj/project.pbxproj

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,18 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
00E356F31AD99517003FC87E /* sentryreactnativesampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* sentryreactnativesampleTests.m */; };
10+
00E356F31AD99517003FC87E /* sentryreactnativesampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* sentryreactnativesampleTests.m */; };
1111
0C80B921A6F3F58F76C31292 /* libPods-sentryreactnativesample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-sentryreactnativesample.a */; };
1212
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13-
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
1413
5ACADB1A9924EDD0850FACBA /* libPods-sentryreactnativesample-sentryreactnativesampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AFC2BCCFBDE2DC231B5C04E5 /* libPods-sentryreactnativesample-sentryreactnativesampleTests.a */; };
14+
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
1515
9416CD608C927040C56DEF7A /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
1616
B2FBDDFF2E4A0F6C00B18357 /* NativePlatformSampleModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2FBDDFC2E4A0F6C00B18357 /* NativePlatformSampleModule.mm */; };
1717
B2FBDE002E4A0F6C00B18357 /* RCTAssetsModule.m in Sources */ = {isa = PBXBuildFile; fileRef = B2FBDDFE2E4A0F6C00B18357 /* RCTAssetsModule.m */; };
1818
B2FBDE052E4A11F800B18357 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B2FBDE042E4A11F800B18357 /* main.m */; };
1919
B2FBDE062E4A11F800B18357 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2FBDE032E4A11F800B18357 /* AppDelegate.mm */; };
2020
/* End PBXBuildFile section */
2121

22-
/* Begin PBXContainerItemProxy section */
23-
00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = {
24-
isa = PBXContainerItemProxy;
25-
containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
26-
proxyType = 1;
27-
remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
28-
remoteInfo = sentryreactnativesample;
29-
};
30-
/* End PBXContainerItemProxy section */
31-
3222
/* Begin PBXFileReference section */
3323
00E356EE1AD99517003FC87E /* sentryreactnativesampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sentryreactnativesampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3424
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -39,17 +29,17 @@
3929
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = sentryreactnativesample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
4030
3B4392A12AC88292D35C810B /* Pods-sentryreactnativesample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sentryreactnativesample.debug.xcconfig"; path = "Target Support Files/Pods-sentryreactnativesample/Pods-sentryreactnativesample.debug.xcconfig"; sourceTree = "<group>"; };
4131
5709B34CF0A7D63546082F79 /* Pods-sentryreactnativesample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sentryreactnativesample.release.xcconfig"; path = "Target Support Files/Pods-sentryreactnativesample/Pods-sentryreactnativesample.release.xcconfig"; sourceTree = "<group>"; };
42-
AFC2BCCFBDE2DC231B5C04E5 /* libPods-sentryreactnativesample-sentryreactnativesampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sentryreactnativesample-sentryreactnativesampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
43-
5DCACB8F33CDC322A6C60F78 /* libPods-sentryreactnativesample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sentryreactnativesample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4432
5B7EB9410499542E8C5724F5 /* Pods-sentryreactnativesample-sentryreactnativesampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sentryreactnativesample-sentryreactnativesampleTests.debug.xcconfig"; path = "Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests.debug.xcconfig"; sourceTree = "<group>"; };
33+
5DCACB8F33CDC322A6C60F78 /* libPods-sentryreactnativesample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sentryreactnativesample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4534
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = sentryreactnativesample/LaunchScreen.storyboard; sourceTree = "<group>"; };
35+
89C6BE57DB24E9ADA2F236DE /* Pods-sentryreactnativesample-sentryreactnativesampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sentryreactnativesample-sentryreactnativesampleTests.release.xcconfig"; path = "Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests.release.xcconfig"; sourceTree = "<group>"; };
36+
AFC2BCCFBDE2DC231B5C04E5 /* libPods-sentryreactnativesample-sentryreactnativesampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sentryreactnativesample-sentryreactnativesampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4637
B2FBDDFB2E4A0F6C00B18357 /* NativePlatformSampleModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NativePlatformSampleModule.h; path = sentryreactnativesample/NativePlatformSampleModule.h; sourceTree = "<group>"; };
4738
B2FBDDFC2E4A0F6C00B18357 /* NativePlatformSampleModule.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = NativePlatformSampleModule.mm; path = sentryreactnativesample/NativePlatformSampleModule.mm; sourceTree = "<group>"; };
4839
B2FBDDFD2E4A0F6C00B18357 /* RCTAssetsModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RCTAssetsModule.h; path = sentryreactnativesample/RCTAssetsModule.h; sourceTree = "<group>"; };
4940
B2FBDDFE2E4A0F6C00B18357 /* RCTAssetsModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RCTAssetsModule.m; path = sentryreactnativesample/RCTAssetsModule.m; sourceTree = "<group>"; };
5041
B2FBDE022E4A11F800B18357 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = sentryreactnativesample/AppDelegate.h; sourceTree = "<group>"; };
5142
B2FBDE032E4A11F800B18357 /* AppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = sentryreactnativesample/AppDelegate.mm; sourceTree = "<group>"; };
52-
89C6BE57DB24E9ADA2F236DE /* Pods-sentryreactnativesample-sentryreactnativesampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sentryreactnativesample-sentryreactnativesampleTests.release.xcconfig"; path = "Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests.release.xcconfig"; sourceTree = "<group>"; };
5343
B2FBDE042E4A11F800B18357 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = main.m; path = sentryreactnativesample/main.m; sourceTree = "<group>"; };
5444
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
5545
/* End PBXFileReference section */
@@ -178,7 +168,6 @@
178168
buildRules = (
179169
);
180170
dependencies = (
181-
00E356F51AD99517003FC87E /* PBXTargetDependency */,
182171
);
183172
name = sentryreactnativesampleTests;
184173
productName = sentryreactnativesampleTests;
@@ -297,36 +286,36 @@
297286
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sentryreactnativesample/Pods-sentryreactnativesample-frameworks.sh\"\n";
298287
showEnvVarsInLog = 0;
299288
};
300-
65A561E97EBED657593E8ABF /* [CP] Copy Pods Resources */ = {
289+
53F600B32E9740FC884E7AD6 /* Upload Debug Symbols to Sentry */ = {
301290
isa = PBXShellScriptBuildPhase;
302291
buildActionMask = 2147483647;
303292
files = (
304293
);
305-
inputFileListPaths = (
306-
"${PODS_ROOT}/Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests-resources-${CONFIGURATION}-input-files.xcfilelist",
294+
inputPaths = (
307295
);
308-
name = "[CP] Copy Pods Resources";
309-
outputFileListPaths = (
310-
"${PODS_ROOT}/Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests-resources-${CONFIGURATION}-output-files.xcfilelist",
296+
name = "Upload Debug Symbols to Sentry";
297+
outputPaths = (
311298
);
312299
runOnlyForDeploymentPostprocessing = 0;
313300
shellPath = /bin/sh;
314-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests-resources.sh\"\n";
315-
showEnvVarsInLog = 0;
301+
shellScript = "/bin/sh ../node_modules/@sentry/react-native/scripts/sentry-xcode-debug-files.sh\n";
316302
};
317-
53F600B32E9740FC884E7AD6 /* Upload Debug Symbols to Sentry */ = {
303+
65A561E97EBED657593E8ABF /* [CP] Copy Pods Resources */ = {
318304
isa = PBXShellScriptBuildPhase;
319305
buildActionMask = 2147483647;
320306
files = (
321307
);
322-
inputPaths = (
308+
inputFileListPaths = (
309+
"${PODS_ROOT}/Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests-resources-${CONFIGURATION}-input-files.xcfilelist",
323310
);
324-
name = "Upload Debug Symbols to Sentry";
325-
outputPaths = (
311+
name = "[CP] Copy Pods Resources";
312+
outputFileListPaths = (
313+
"${PODS_ROOT}/Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests-resources-${CONFIGURATION}-output-files.xcfilelist",
326314
);
327315
runOnlyForDeploymentPostprocessing = 0;
328316
shellPath = /bin/sh;
329-
shellScript = "/bin/sh ../node_modules/@sentry/react-native/scripts/sentry-xcode-debug-files.sh\n";
317+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sentryreactnativesample-sentryreactnativesampleTests/Pods-sentryreactnativesample-sentryreactnativesampleTests-resources.sh\"\n";
318+
showEnvVarsInLog = 0;
330319
};
331320
A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = {
332321
isa = PBXShellScriptBuildPhase;

0 commit comments

Comments
 (0)