diff --git a/.gitmodules b/.gitmodules index df341b7a1f..5921e67246 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/.travis.yml b/.travis.yml index f99a99face..88fa290e50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 49f5e3ce45..be5fb5a283 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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` diff --git a/README.md b/README.md index e8a66df2aa..580526f9c6 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/SentryReactNative.podspec b/SentryReactNative.podspec index b3adfcf6a3..ea40dd72f4 100644 --- a/SentryReactNative.podspec +++ b/SentryReactNative.podspec @@ -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' diff --git a/android/build.gradle b/android/build.gradle index f051204951..1a07631ede 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion '23.0.1' + compileSdkVersion 26 + buildToolsVersion '26.0.3' defaultConfig { consumerProguardFiles 'proguard-rules.pro' @@ -11,7 +11,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 26 versionCode 1 versionName "1.0" ndk { @@ -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' } diff --git a/examples b/examples index 11e71fa3a2..7f8b0aecdc 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit 11e71fa3a2fa596707bc1607ff7b79b21fafa17f +Subproject commit 7f8b0aecdc26bc425d2b95496b1a79eb0165c3b0 diff --git a/ios/KSCrash b/ios/KSCrash deleted file mode 160000 index 0dee986501..0000000000 --- a/ios/KSCrash +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0dee9865010e8ce05d697d68882f825fe9229262 diff --git a/ios/RNSentry.m b/ios/RNSentry.m index 4b8bdb9d3b..11515c0fb8 100644 --- a/ios/RNSentry.m +++ b/ios/RNSentry.m @@ -6,11 +6,10 @@ #import "RCTConvert.h" #endif -#import #import NSString *const RNSentryVersionString = @"0.38.3"; -NSString *const RNSentrySdkName = @"sentry-react-native"; +NSString *const RNSentrySdkName = @"sentry.javascript.react-native"; @interface RNSentry() diff --git a/ios/RNSentry.xcodeproj/project.pbxproj b/ios/RNSentry.xcodeproj/project.pbxproj index 1ca901199f..e0eb7a52c2 100644 --- a/ios/RNSentry.xcodeproj/project.pbxproj +++ b/ios/RNSentry.xcodeproj/project.pbxproj @@ -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 */; @@ -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 = ""; }; 6378C6F91EAF630500A1F1EE /* RNSentryEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNSentryEventEmitter.h; sourceTree = ""; }; 6378C6FA1EAF630500A1F1EE /* RNSentryEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSentryEventEmitter.m; sourceTree = ""; }; 6387B7971ED84BA70045A84C /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; @@ -110,7 +73,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6387B7BC1ED84D350045A84C /* libKSCrashLib.a in Frameworks */, 6387B8591ED8521B0045A84C /* libSentryStatic.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -142,23 +104,11 @@ 632232581E76C45800F58A1F /* Libraries */ = { isa = PBXGroup; children = ( - 632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */, 6387B8441ED8520D0045A84C /* Sentry.xcodeproj */, ); name = Libraries; sourceTree = ""; }; - 632235E61E76E24300F58A1F /* Products */ = { - isa = PBXGroup; - children = ( - 632235ED1E76E24300F58A1F /* libKSCrashLib.a */, - 632235EF1E76E24300F58A1F /* KSCrashTests.xctest */, - 632235F11E76E24300F58A1F /* KSCrash.framework */, - 632235F31E76E24300F58A1F /* KSCrash.framework */, - ); - name = Products; - sourceTree = ""; - }; 6387B7961ED84BA70045A84C /* Frameworks */ = { isa = PBXGroup; children = ( @@ -191,7 +141,6 @@ buildRules = ( ); dependencies = ( - 6387B7BB1ED84D2F0045A84C /* PBXTargetDependency */, 6387B8581ED852170045A84C /* PBXTargetDependency */, ); name = RNSentry; @@ -224,10 +173,6 @@ productRefGroup = 58B511D21A9E6C8500147676; projectDirPath = ""; projectReferences = ( - { - ProductGroup = 632235E61E76E24300F58A1F /* Products */; - ProjectRef = 632235E51E76E24300F58A1F /* KSCrash-iOS.xcodeproj */; - }, { ProductGroup = 6387B8451ED8520D0045A84C /* Products */; ProjectRef = 6387B8441ED8520D0045A84C /* Sentry.xcodeproj */; @@ -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; @@ -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; diff --git a/ios/RNSentry.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/RNSentry.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/ios/RNSentry.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Sentry b/ios/Sentry index a2f8a64376..d6440fa587 160000 --- a/ios/Sentry +++ b/ios/Sentry @@ -1 +1 @@ -Subproject commit a2f8a64376dcb46a68444ff0adb0562eb1aa4f97 +Subproject commit d6440fa587a833a45ed75e3eb97ea5ce5f1414e0 diff --git a/package.json b/package.json index 22e6309ffe..be24f52d47 100644 --- a/package.json +++ b/package.json @@ -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": {