toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sentry build issues (#570)

Browse source 
* Fix sentry build issues

* Review feedback
This commit is contained in:
Chris Duarte 2017-05-26 03:38:48 -07:00 committed by enahum
parent edfa3b1229
commit 9a05aeec78
3 changed files with 51 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
ios/Mattermost.xcodeproj/project.pbxproj
View file

@ -22,7 +22,6 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
1B8F9196C9EB4B97837FD119 /* libRNSentry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5460B2A0C10450FB005ECCB /* libRNSentry.a */; };
1BCA51319AC6442991C6A208 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0A091BF1A3D04650AD306A0D /* Zocial.ttf */; };
2B4C9B708010475DA575B81D /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1F071EE85494E269A50AE88 /* SimpleLineIcons.ttf */; };
2E3655C7E15049DBBC3A666B /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFE628F5A526417D85AD635E /* libRNImagePicker.a */; };
@ -44,6 +43,7 @@
7FED0C321E7C4AAC001A7CCA /* libRNCookieManagerIOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F906D971E6A1ADF00B8F49A /* libRNCookieManagerIOS.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
895C9A56B94A45C1BAF568FE /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AC6EB561E1F64C17A69D2FAD /* Entypo.ttf */; };
A323CD3086A24E6389F9FA3D /* libRNSentry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E62054273C5432F9FBC4610 /* libRNSentry.a */; };
B50561A109B4442299F82327 /* libRNSearchBar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F81F6DC42D394831B4549928 /* libRNSearchBar.a */; };
C035DB50ED2045F09923FFAE /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 04AA5E8EF3B54735A11E3B95 /* MaterialCommunityIcons.ttf */; };
C337E8708D2845C6A8DBB47E /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2DCFD31D3F4A4154822AB532 /* Ionicons.ttf */; };
@ -121,6 +121,13 @@
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RCTOrientation;
};
3764FB9F1ED76F5800831280 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8B6ED4C761D5442BA69331E3 /* RNSentry.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RNSentry;
};
3779BE9F1EB1235400D081C1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 85E82BCA0FD245EEA520D106 /* RNImagePicker.xcodeproj */;
@ -142,13 +149,6 @@
remoteGlobalIDString = DA5891D81BA9A9FC002B4DB2;
remoteInfo = RNDeviceInfo;
};
37E6FE151ECF425000AB1D50 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 480554DC6FB548B2B6F37A29 /* RNSentry.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RNSentry;
};
3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@ -373,13 +373,13 @@
31A0780E2F224AC8AF8E6930 /* RNCookieManagerIOS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCookieManagerIOS.xcodeproj; path = "../node_modules/react-native-cookies/RNCookieManagerIOS.xcodeproj"; sourceTree = "<group>"; };
349FBA7338E74D9BBD709528 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
356C9186FA374641A00EB2EA /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
480554DC6FB548B2B6F37A29 /* 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>"; };
51F5A483EA9F4A9A87ACFB59 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
59954D479A89488091EB588F /* RNSearchBar.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSearchBar.xcodeproj; path = "../node_modules/react-native-search-bar/RNSearchBar.xcodeproj"; sourceTree = "<group>"; };
5C3B95629BA74FB3A8377CB7 /* RCTOrientation.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTOrientation.xcodeproj; path = "../node_modules/react-native-orientation/iOS/RCTOrientation.xcodeproj"; sourceTree = "<group>"; };
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
7DCC3D826CE640AF8F491692 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
7E62054273C5432F9FBC4610 /* libRNSentry.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSentry.a; sourceTree = "<group>"; };
7F292A701E8AB73400A450A3 /* SplashScreenResource */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SplashScreenResource; sourceTree = "<group>"; };
7F292AA41E8ABB1100A450A3 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = LaunchScreen.xib; path = SplashScreenResource/LaunchScreen.xib; sourceTree = "<group>"; };
7F292AA51E8ABB1100A450A3 /* splash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = splash.png; path = SplashScreenResource/splash.png; sourceTree = "<group>"; };
@ -389,11 +389,11 @@
7FC200BC1EBB65100099331B /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = "../node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj"; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
85E82BCA0FD245EEA520D106 /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = "<group>"; };
8B6ED4C761D5442BA69331E3 /* 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>"; };
AC6EB561E1F64C17A69D2FAD /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
ACC6B9FDC0AD45A6BFA4FBCD /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBVLinearGradient.a; sourceTree = "<group>"; };
B97AA6F961BB47D3A3297E8E /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
DFE628F5A526417D85AD635E /* libRNImagePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNImagePicker.a; sourceTree = "<group>"; };
E5460B2A0C10450FB005ECCB /* libRNSentry.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSentry.a; sourceTree = "<group>"; };
EDC04CBCF81642219D199CBB /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; };
EE671DF7637347CD8C069819 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDeviceInfo.a; sourceTree = "<group>"; };
F1F071EE85494E269A50AE88 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
@ -435,7 +435,7 @@
7F6877B31E7836070094B63F /* libToolTipMenu.a in Frameworks */,
2E3655C7E15049DBBC3A666B /* libRNImagePicker.a in Frameworks */,
7FC200E81EBB65370099331B /* libReactNativeNavigation.a in Frameworks */,
1B8F9196C9EB4B97837FD119 /* libRNSentry.a in Frameworks */,
A323CD3086A24E6389F9FA3D /* libRNSentry.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -574,6 +574,14 @@
name = Products;
sourceTree = "<group>";
};
3764FB7A1ED76F5800831280 /* Products */ = {
isa = PBXGroup;
children = (
3764FBA01ED76F5800831280 /* libRNSentry.a */,
);
name = Products;
sourceTree = "<group>";
};
3779BE7C1EB1235400D081C1 /* Products */ = {
isa = PBXGroup;
children = (
@ -598,14 +606,6 @@
name = Products;
sourceTree = "<group>";
};
37E6FDF01ECF425000AB1D50 /* Products */ = {
isa = PBXGroup;
children = (
37E6FE161ECF425000AB1D50 /* libRNSentry.a */,
);
name = Products;
sourceTree = "<group>";
};
5E91572E1DD0AC6500FF2AA8 /* Products */ = {
isa = PBXGroup;
children = (
@ -707,7 +707,7 @@
7DCC3D826CE640AF8F491692 /* BVLinearGradient.xcodeproj */,
5C3B95629BA74FB3A8377CB7 /* RCTOrientation.xcodeproj */,
85E82BCA0FD245EEA520D106 /* RNImagePicker.xcodeproj */,
480554DC6FB548B2B6F37A29 /* RNSentry.xcodeproj */,
8B6ED4C761D5442BA69331E3 /* RNSentry.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
@ -897,8 +897,8 @@
ProjectRef = 59954D479A89488091EB588F /* RNSearchBar.xcodeproj */;
},
{
ProductGroup = 37E6FDF01ECF425000AB1D50 /* Products */;
ProjectRef = 480554DC6FB548B2B6F37A29 /* RNSentry.xcodeproj */;
ProductGroup = 3764FB7A1ED76F5800831280 /* Products */;
ProjectRef = 8B6ED4C761D5442BA69331E3 /* RNSentry.xcodeproj */;
},
{
ProductGroup = 7FDF28C41E1F4B1F00DBBE56 /* Products */;
@ -985,6 +985,13 @@
remoteRef = 374634661E848085005E1244 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3764FBA01ED76F5800831280 /* libRNSentry.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRNSentry.a;
remoteRef = 3764FB9F1ED76F5800831280 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3779BEA01EB1235400D081C1 /* libRNImagePicker.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -1006,13 +1013,6 @@
remoteRef = 37DD11271E79EBE1004111BA /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
37E6FE161ECF425000AB1D50 /* libRNSentry.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRNSentry.a;
remoteRef = 37E6FE151ECF425000AB1D50 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@ -1241,7 +1241,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "sentry=$(grep -Eio \"\\\"EnableSentryLogging\\\":true\" ../dist/assets/config.json)\n\nexport NODE_BINARY=node\n\nif [[ -n \"${sentry/[ ]*\\n/}\" ]]\nthen\ntoken=$(grep -o '\"SentryAuthToken\": *\"[^\"]*\"' ../dist/assets/config.json | grep -o '\"[^\"]*\"$' | sed -e 's/^\"//' -e 's/\"$//')\norg=$(grep -o '\"SentryOrg\": *\"[^\"]*\"' ../dist/assets/config.json | grep -o '\"[^\"]*\"$' | sed -e 's/^\"//' -e 's/\"$//')\nproject=$(grep -o '\"SentryProject\": *\"[^\"]*\"' ../dist/assets/config.json | grep -o '\"[^\"]*\"$' | sed -e 's/^\"//' -e 's/\"$//')\n\nexport SENTRY_ORG=$org\nexport SENTRY_PROJECT=$project\nexport SENTRY_AUTH_TOKEN=$token\n\n../node_modules/react-native-sentry/bin/bundle-frameworks\nsentry-cli react-native-xcode\n../node_modules/react-native/packager/react-native-xcode.sh\nsentry-cli upload-dsym\nelse\n../node_modules/react-native/packager/react-native-xcode.sh\nfi\n\n";
shellScript = "sentry=$(grep -Eio \"\\\"EnableSentryLogging\\\":true\" ../dist/assets/config.json)\n\nexport NODE_BINARY=node\n\nif [[ -n \"${sentry/[ ]*\\n/}\" ]]\nthen\n\nexport SENTRY_PROPERTIES=sentry.properties\n\n../node_modules/sentry-cli-binary/bin/sentry-cli react-native-xcode \\\n../node_modules/react-native/packager/react-native-xcode.sh\n../node_modules/sentry-cli-binary/bin/sentry-cli upload-dsym\nelse\n../node_modules/react-native/packager/react-native-xcode.sh\nfi\n\n";
};
/* End PBXShellScriptBuildPhase section */

2
package.json
View file

@ -30,7 +30,7 @@
"react-native-orientation": "enahum/react-native-orientation.git",
"react-native-push-notification": "3.0.0",
"react-native-search-bar": "enahum/react-native-search-bar.git",
"react-native-sentry": "getsentry/react-native-sentry.git",
"react-native-sentry": "0.10.0",
"react-native-svg": "5.1.8",
"react-native-tooltip": "5.0.0",
"react-native-vector-icons": "4.1.1",

28
yarn.lock
View file

@ -2262,9 +2262,11 @@ external-editor@^1.0.1:
tmp "^0.0.29"
external-editor@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.2.tgz#384f6d8ae02054235c19e0a142c6d6fc36ad9363"
version "2.0.4"
resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
dependencies:
iconv-lite "^0.4.17"
jschardet "^1.4.2"
tmp "^0.0.31"
extglob@^0.3.1:
@ -2788,6 +2790,10 @@ iconv-lite@0.4.15:
version "0.4.15"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
iconv-lite@^0.4.17:
version "0.4.17"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
ignore@^3.2.0:
version "3.2.7"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"
@ -3166,6 +3172,10 @@ jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
jschardet@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.4.2.tgz#2aa107f142af4121d145659d44f50830961e699a"
jsdom-global@3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
@ -4438,14 +4448,16 @@ react-native-search-bar@enahum/react-native-search-bar.git:
version "2.16.0"
resolved "https://codeload.github.com/enahum/react-native-search-bar/tar.gz/88e6f5ba68012440ec21bde8388ca9e3124921c0"
react-native-sentry@getsentry/react-native-sentry.git:
version "0.9.1"
resolved "https://codeload.github.com/getsentry/react-native-sentry/tar.gz/1fb1a4ca201a814389bd33a6277ab4e3dc085fed"
react-native-sentry@0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/react-native-sentry/-/react-native-sentry-0.10.0.tgz#1dda468942adc786860f5add31aa8c7b320fbfc8"
dependencies:
chalk "^1.1.1"
glob "7.1.1"
inquirer "3.0.6"
raven-js "^3.15.0"
sentry-cli-binary "^1.9.0"
xcode "0.9.3"
react-native-svg-mock@1.0.2:
version "1.0.2"
@ -5130,8 +5142,8 @@ send@0.15.1:
statuses "~1.3.1"
sentry-cli-binary@^1.9.0:
version "1.10.1"
resolved "https://registry.yarnpkg.com/sentry-cli-binary/-/sentry-cli-binary-1.10.1.tgz#c1099c9830dab81d205d62687f3a3eb68d5e1a60"
version "1.10.2"
resolved "https://registry.yarnpkg.com/sentry-cli-binary/-/sentry-cli-binary-1.10.2.tgz#a3ed11c673093d83206d01d2d87a16fcb331db7b"
dependencies:
progress "2.0.0"
@ -5867,7 +5879,7 @@ ws@^2.0.3:
safe-buffer "~5.0.1"
ultron "~1.1.0"
xcode@^0.9.1:
xcode@0.9.3, xcode@^0.9.1:
version "0.9.3"
resolved "https://registry.yarnpkg.com/xcode/-/xcode-0.9.3.tgz#910a89c16aee6cc0b42ca805a6d0b4cf87211cf3"
dependencies: