Skip to content

Commit 93c446f

Browse files
HazATHazAT
authored
Merge pull request #69 from getsentry/feature/sentry-3.0
Support for sentry-cocoa 3.0
2 parents f9e7c79 + 7c391d9 commit 93c446f

File tree

9 files changed

+661
-571
lines changed

9 files changed

+661
-571
lines changed

‎bin/bundle-frameworks‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎examples/ReactNativeExample/ios/ReactNativeExample.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
2525
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
2626
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
27+
8C44FB5926B54E818A892A25 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2030FF38C5C7479A9E3F72F3 /* libz.tbd */; };
2728
C0D5AD675F9445918A2A5F71 /* libRNSentry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1D4EF2667C40A491FCA3A2 /* libRNSentry.a */; };
2829
/* End PBXBuildFile section */
2930

@@ -252,6 +253,7 @@
252253
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ReactNativeExample/Info.plist; sourceTree = "<group>"; };
253254
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ReactNativeExample/main.m; sourceTree = "<group>"; };
254255
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
256+
2030FF38C5C7479A9E3F72F3 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
255257
389218E3ED8B4610A9B360F1 /* RNSentry.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSentry.xcodeproj; path = "../node_modules/react-native-sentry/ios/RNSentry.xcodeproj"; sourceTree = "<group>"; };
256258
3D1D4EF2667C40A491FCA3A2 /* libRNSentry.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSentry.a; sourceTree = "<group>"; };
257259
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
@@ -284,6 +286,7 @@
284286
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
285287
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
286288
C0D5AD675F9445918A2A5F71 /* libRNSentry.a in Frameworks */,
289+
8C44FB5926B54E818A892A25 /* libz.tbd in Frameworks */,
287290
);
288291
runOnlyForDeploymentPostprocessing = 0;
289292
};
@@ -400,7 +403,7 @@
400403
isa = PBXGroup;
401404
children = (
402405
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */,
403-
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */,
406+
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */,
404407
);
405408
name = Products;
406409
sourceTree = "<group>";
@@ -413,6 +416,14 @@
413416
name = Products;
414417
sourceTree = "<group>";
415418
};
419+
63AF67B21EDC552500EBCFF7 /* Frameworks */ = {
420+
isa = PBXGroup;
421+
children = (
422+
2030FF38C5C7479A9E3F72F3 /* libz.tbd */,
423+
);
424+
name = Frameworks;
425+
sourceTree = "<group>";
426+
};
416427
78C398B11ACF4ADC00677621 /* Products */ = {
417428
isa = PBXGroup;
418429
children = (
@@ -453,6 +464,7 @@
453464
83CBB9F61A601CBA00E9B192 = {
454465
isa = PBXGroup;
455466
children = (
467+
63AF67B21EDC552500EBCFF7 /* Frameworks */,
456468
13B07FAE1A68108700A75B9A /* ReactNativeExample */,
457469
832341AE1AAA6A7D00B99B32 /* Libraries */,
458470
00E356EF1AD99517003FC87E /* ReactNativeExampleTests */,
@@ -501,6 +513,7 @@
501513
13B07F8E1A680F5B00A75B9A /* Resources */,
502514
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
503515
6350253C1E1E816100408AE7 /* Copy Files */,
516+
7F30919BF7F84991BBAB4FDF /* Upload Debug Symbols to Sentry */,
504517
);
505518
buildRules = (
506519
);
@@ -753,10 +766,10 @@
753766
remoteRef = 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
754767
sourceTree = BUILT_PRODUCTS_DIR;
755768
};
756-
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */ = {
769+
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
757770
isa = PBXReferenceProxy;
758771
fileType = archive.ar;
759-
path = "libRCTAnimation-tvOS.a";
772+
path = libRCTAnimation.a;
760773
remoteRef = 5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
761774
sourceTree = BUILT_PRODUCTS_DIR;
762775
};
@@ -815,7 +828,21 @@
815828
);
816829
runOnlyForDeploymentPostprocessing = 0;
817830
shellPath = /bin/sh;
818-
shellScript = "../node_modules/react-native-sentry/bin/bundle-frameworks\nexport SENTRY_ORG=org\nexport SENTRY_PROJECT=project\nexport SENTRY_AUTH_TOKEN=token\n#export SENTRY_URL=\nexport NODE_BINARY=node\nsentry-cli react-native-xcode ../node_modules/react-native/packager/react-native-xcode.sh";
831+
shellScript = "#../node_modules/react-native-sentry/bin/bundle-frameworks\nexport SENTRY_ORG=org\nexport SENTRY_PROJECT=project\nexport SENTRY_AUTH_TOKEN=token\n#export SENTRY_URL=\nexport NODE_BINARY=node\nsentry-cli react-native-xcode ../node_modules/react-native/packager/react-native-xcode.sh";
832+
};
833+
7F30919BF7F84991BBAB4FDF /* Upload Debug Symbols to Sentry */ = {
834+
isa = PBXShellScriptBuildPhase;
835+
buildActionMask = 2147483647;
836+
files = (
837+
);
838+
inputPaths = (
839+
);
840+
name = "Upload Debug Symbols to Sentry";
841+
outputPaths = (
842+
);
843+
runOnlyForDeploymentPostprocessing = 0;
844+
shellPath = /bin/sh;
845+
shellScript = "export SENTRY_PROPERTIES=sentry.properties\n../node_modules/sentry-cli-binary/bin/sentry-cli upload-dsym";
819846
};
820847
/* End PBXShellScriptBuildPhase section */
821848

@@ -900,7 +927,7 @@
900927
13B07F941A680F5B00A75B9A /* Debug */ = {
901928
isa = XCBuildConfiguration;
902929
buildSettings = {
903-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
930+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
904931
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
905932
CURRENT_PROJECT_VERSION = 1;
906933
DEAD_CODE_STRIPPING = NO;
@@ -923,7 +950,7 @@
923950
13B07F951A680F5B00A75B9A /* Release */ = {
924951
isa = XCBuildConfiguration;
925952
buildSettings = {
926-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
953+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
927954
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
928955
CURRENT_PROJECT_VERSION = 1;
929956
DEVELOPMENT_TEAM = 97JCY7859U;

‎examples/ReactNativeExample/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"dependencies": {
1010
"react": "^16.0.0-alpha.6",
11-
"react-native": "^0.44.0",
11+
"react-native": "^0.44.1",
1212
"react-native-sentry": "file:../../"
1313
}
1414
}

0 commit comments

Comments
 (0)