Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Bump deps #452

Merged
merged 14 commits into from
Jul 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "ios/Sentry"]
path = ios/Sentry
url=https://github.com/getsentry/sentry-cocoa
[submodule "ios/KSCrash"]
path = ios/KSCrash
url=https://github.com/kstenerud/KSCrash
[submodule "examples"]
path = examples
url = https://github.com/getsentry/examples
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@ matrix:
before_install:
- nvm install 8
- .travis/before_install.sh
- echo yes | sdkmanager "platforms;android-26"
android:
components:
- build-tools-23.0.1
- android-23
- extra-android-m2repository
- extra-google-google_play_services
- extra-google-m2repository
- addon-google_apis-google-16
- tools
- platform-tools
- build-tools-26.0.3
- tools
env: LANE='android'
script: .travis/run.sh

Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## v0.39.0

- `react-native-sentry >= 0.39.0` requires `react-native >= 0.56.0`
- [Android] Bumping of gradle deps
```
compileSdkVersion 26
buildToolsVersion '26.0.3'
...
targetSdkVersion 26
```
- [Android] Use `sentry-android` `1.7.5`
- Bump `@sentry/wizard` `0.11.0`
- Bump `sentry-cocoa` `4.0.1`
- Use new SDK identifier `sentry.javascript.react-native`

## v0.38.3

- Bump `@sentry/wizard` `0.10.2`
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

* `react-native >= 0.38` for iOS
* `react-native >= 0.41` for Android
* `react-native-sentry >= 0.39.0` requires `react-native >= 0.56.0`
* `sentry-cli >= 1.9.0` (`brew install getsentry/tools/sentry-cli`)

With this SDK, Sentry is now able to provide mixed stacktraces. This means that if a JavaScript call causes a crash in native code, you will see the last call from JavaScript before the crash. This also means that with the new SDK, native crashes are properly handled on iOS.
Expand Down
3 changes: 1 addition & 2 deletions SentryReactNative.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ Pod::Spec.new do |s|
s.preserve_paths = '*.js'

s.dependency 'React'
s.dependency 'Sentry', '~> 3.12.4'
s.dependency 'Sentry/KSCrash', '~> 3.12.4'
s.dependency 'Sentry', '~> 4.0.1'

s.source_files = 'ios/RNSentry*.{h,m}'
s.public_header_files = 'ios/RNSentry.h'
Expand Down
8 changes: 4 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion '23.0.1'
compileSdkVersion 26
buildToolsVersion '26.0.3'

defaultConfig {
consumerProguardFiles 'proguard-rules.pro'
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion 26
versionCode 1
versionName "1.0"
ndk {
Expand All @@ -25,5 +25,5 @@ android {

dependencies {
compile 'com.facebook.react:react-native:+'
compile 'io.sentry:sentry-android:1.7.4'
compile 'io.sentry:sentry-android:1.7.5'
}
2 changes: 1 addition & 1 deletion examples
1 change: 0 additions & 1 deletion ios/KSCrash
Submodule KSCrash deleted from 0dee98
3 changes: 1 addition & 2 deletions ios/RNSentry.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
#import "RCTConvert.h"
#endif

#import <KSCrash/KSCrash.h>
#import <Sentry/Sentry.h>

NSString *const RNSentryVersionString = @"0.38.3";
NSString *const RNSentrySdkName = @"sentry-react-native";
NSString *const RNSentrySdkName = @"sentry.javascript.react-native";

@interface RNSentry()

Expand Down
88 changes: 0 additions & 88 deletions ios/RNSentry.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,11 @@
/* Begin PBXBuildFile section */
6350257B1E1E845F00408AE7 /* RNSentry.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = B3E7B5881CC2AC0600A0062D /* RNSentry.h */; };
6378C6FB1EAF630500A1F1EE /* RNSentryEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6378C6FA1EAF630500A1F1EE /* RNSentryEventEmitter.m */; };
6387B7BC1ED84D350045A84C /* libKSCrashLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 632235ED1E76E24300F58A1F /* libKSCrashLib.a */; };
6387B8591ED8521B0045A84C /* libSentryStatic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6387B8561ED8520D0045A84C /* libSentryStatic.a */; };
B3E7B58A1CC2AC0600A0062D /* RNSentry.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNSentry.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
632235EC1E76E24300F58A1F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = CB6D132617EB749A00BC2C04;
remoteInfo = KSCrashLib;
};
632235EE1E76E24300F58A1F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = CB6D133317EB749A00BC2C04;
remoteInfo = KSCrashTests;
};
632235F01E76E24300F58A1F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 03DE7B6A1C84DEF700F789BA;
remoteInfo = KSCrash;
};
632235F21E76E24300F58A1F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EDF2BF211CCF15AD004BADF4;
remoteInfo = KSCrash_static;
};
6387B7BA1ED84D2F0045A84C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = CB6D132517EB749A00BC2C04;
remoteInfo = KSCrashLib;
};
6387B84D1ED8520D0045A84C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6387B8441ED8520D0045A84C /* Sentry.xcodeproj */;
Expand Down Expand Up @@ -96,7 +60,6 @@

/* Begin PBXFileReference section */
134814201AA4EA6300B7C361 /* libRNSentry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNSentry.a; sourceTree = BUILT_PRODUCTS_DIR; };
632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "KSCrash-iOS.xcodeproj"; path = "KSCrash/iOS/KSCrash-iOS.xcodeproj"; sourceTree = "<group>"; };
6378C6F91EAF630500A1F1EE /* RNSentryEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNSentryEventEmitter.h; sourceTree = "<group>"; };
6378C6FA1EAF630500A1F1EE /* RNSentryEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSentryEventEmitter.m; sourceTree = "<group>"; };
6387B7971ED84BA70045A84C /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
Expand All @@ -110,7 +73,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
6387B7BC1ED84D350045A84C /* libKSCrashLib.a in Frameworks */,
6387B8591ED8521B0045A84C /* libSentryStatic.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -142,23 +104,11 @@
632232581E76C45800F58A1F /* Libraries */ = {
isa = PBXGroup;
children = (
632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */,
6387B8441ED8520D0045A84C /* Sentry.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
};
632235E61E76E24300F58A1F /* Products */ = {
isa = PBXGroup;
children = (
632235ED1E76E24300F58A1F /* libKSCrashLib.a */,
632235EF1E76E24300F58A1F /* KSCrashTests.xctest */,
632235F11E76E24300F58A1F /* KSCrash.framework */,
632235F31E76E24300F58A1F /* KSCrash.framework */,
);
name = Products;
sourceTree = "<group>";
};
6387B7961ED84BA70045A84C /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -191,7 +141,6 @@
buildRules = (
);
dependencies = (
6387B7BB1ED84D2F0045A84C /* PBXTargetDependency */,
6387B8581ED852170045A84C /* PBXTargetDependency */,
);
name = RNSentry;
Expand Down Expand Up @@ -224,10 +173,6 @@
productRefGroup = 58B511D21A9E6C8500147676;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 632235E61E76E24300F58A1F /* Products */;
ProjectRef = 632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */;
},
{
ProductGroup = 6387B8451ED8520D0045A84C /* Products */;
ProjectRef = 6387B8441ED8520D0045A84C /* Sentry.xcodeproj */;
Expand All @@ -241,34 +186,6 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
632235ED1E76E24300F58A1F /* libKSCrashLib.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libKSCrashLib.a;
remoteRef = 632235EC1E76E24300F58A1F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
632235EF1E76E24300F58A1F /* KSCrashTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = KSCrashTests.xctest;
remoteRef = 632235EE1E76E24300F58A1F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
632235F11E76E24300F58A1F /* KSCrash.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = KSCrash.framework;
remoteRef = 632235F01E76E24300F58A1F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
632235F31E76E24300F58A1F /* KSCrash.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = KSCrash.framework;
remoteRef = 632235F21E76E24300F58A1F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
6387B84E1ED8520D0045A84C /* Sentry.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
Expand Down Expand Up @@ -305,11 +222,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
6387B7BB1ED84D2F0045A84C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = KSCrashLib;
targetProxy = 6387B7BA1ED84D2F0045A84C /* PBXContainerItemProxy */;
};
6387B8581ED852170045A84C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = SentryStatic;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/Sentry
Submodule Sentry updated 193 files
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"author": "Sentry",
"license": "MIT",
"peerDependencies": {
"react-native": ">=0.38.0"
"react-native": ">=0.56.0"
},
"dependencies": {
"@sentry/wizard": "^0.10.2",
"@sentry/wizard": "^0.11.0",
"raven-js": "^3.24.2"
},
"rnpm": {
Expand Down