From 9816df9b6b4a76d8d86d5e639e6b27623f2f84cd Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Mon, 21 Aug 2017 09:50:08 -0700 Subject: [PATCH 1/7] Update dependencies --- SentryReactNative.podspec | 4 ++-- android/build.gradle | 2 +- package.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SentryReactNative.podspec b/SentryReactNative.podspec index 4634d2767a..fe4fc2321a 100644 --- a/SentryReactNative.podspec +++ b/SentryReactNative.podspec @@ -18,8 +18,8 @@ Pod::Spec.new do |s| s.preserve_paths = '*.js' s.dependency 'React' - s.dependency 'Sentry', '~> 3.4.2' - s.dependency 'Sentry/KSCrash', '~> 3.4.2' + s.dependency 'Sentry', '~> 3.4.3' + s.dependency 'Sentry/KSCrash', '~> 3.4.3' 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 6a1d115eb5..0356d938c2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,5 +21,5 @@ android { dependencies { compile 'com.facebook.react:react-native:+' - compile 'io.sentry:sentry-android:1.4.0' + compile 'io.sentry:sentry-android:1.5.0' } diff --git a/package.json b/package.json index c2e3d0b610..9f78ca2700 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "chalk": "^1.1.1", "glob": "7.1.1", "inquirer": "3.0.6", - "raven-js": "^3.16.1", - "sentry-cli-binary": "^1.16.0", + "raven-js": "^3.17.0", + "sentry-cli-binary": "^1.19.1", "xcode": "0.9.3" }, "rnpm": { From ea228d695b23ca44a2b98b3d9dce448c54091c8d Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Mon, 21 Aug 2017 10:23:26 -0700 Subject: [PATCH 2/7] Change postlink to use relative path again --- appium/Makefile | 2 ++ scripts/postlink.js | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/appium/Makefile b/appium/Makefile index b7aeafb315..206b5bdc02 100644 --- a/appium/Makefile +++ b/appium/Makefile @@ -14,7 +14,9 @@ copy-local-files-to-example: find example/node_modules/react-native-sentry/ios -name 'RN*.[h|m]' -exec rm {} \; rm -rf example/node_modules/react-native-sentry/ios/Sentry/Sources/Sentry/* rm -rf example/node_modules/react-native-sentry/android/* + rm -rf example/node_modules/react-native-sentry/scripts/* cp -r ../lib/* example/node_modules/react-native-sentry/lib/ + cp -r ../scripts/* example/node_modules/react-native-sentry/scripts/ find ../ios -name 'RN*.[h|m]' -exec cp {} example/node_modules/react-native-sentry/ios/ \; cp -r ../android/* example/node_modules/react-native-sentry/android/ cp -r ../ios/Sentry/Sources/Sentry/* example/node_modules/react-native-sentry/ios/Sentry/Sources/Sentry/ diff --git a/scripts/postlink.js b/scripts/postlink.js index 12a124f7d0..b24226bd21 100644 --- a/scripts/postlink.js +++ b/scripts/postlink.js @@ -4,7 +4,7 @@ const inquirer = require('inquirer'); const xcode = require('xcode'); const chalk = require('chalk'); const pbxFile = require('xcode/lib/pbxFile'); - +const path = require('path'); const PLATFORMS = ['android', 'ios']; const OBJC_HEADER = '\ @@ -383,7 +383,8 @@ function addSentryInit() { function resolveSentryCliBinaryPath(props) { return new Promise(function(resolve, reject) { try { - props['cli/executable'] = require.resolve('sentry-cli-binary/bin/sentry-cli'); + const cliPath = require.resolve('sentry-cli-binary/bin/sentry-cli'); + props['cli/executable'] = path.relative(process.cwd(), cliPath); } catch (e) { // we do nothing and leave everyting as it is } From 8e35fdca7b0682229f4064ae7c0ddd31301edbe9 Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Mon, 21 Aug 2017 10:44:46 -0700 Subject: [PATCH 3/7] Add hint for server url --- scripts/postlink.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/postlink.js b/scripts/postlink.js index b24226bd21..ac4212f72c 100644 --- a/scripts/postlink.js +++ b/scripts/postlink.js @@ -141,7 +141,10 @@ function getProperties(platform) { { type: 'input', default: cachedProps['defaults/url'] || process.env.SENTRY_URL || getDefaultUrl(), - message: 'The Sentry Server URL for ' + getPlatformName(platform), + message: + 'The Sentry Server URL for ' + + getPlatformName(platform) + + '. Only needed if you use self hosted Sentry, press enter to use default.', name: 'defaults/url' }, { From ff44cbd527fd49b8529658c63c11f5bde1792505 Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Mon, 21 Aug 2017 13:54:41 -0700 Subject: [PATCH 4/7] Use node 8 for tests --- .travis.yml | 2 +- appium/Makefile | 2 +- examples | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3844cd08ca..5eac390d38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: - $HOME/.gradle/wrapper/ sudo: required before_install: - - nvm install 7 + - nvm install 8 - node --version - travis_retry curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list diff --git a/appium/Makefile b/appium/Makefile index 206b5bdc02..627bc42a0b 100644 --- a/appium/Makefile +++ b/appium/Makefile @@ -35,6 +35,6 @@ local-android-test: fastlane build_android_for_device_farm ANDROID=1 pytest -vv tests/test_android.py -local-test: +local-test: create-test-bundle new-demo-project copy-local-files-to-example fastlane build_for_local_appium pytest -vv tests/test_ios.py diff --git a/examples b/examples index 577fc0dfaa..fce62ed59b 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit 577fc0dfaa30d5856fcd22381d60070855463e6d +Subproject commit fce62ed59b417f99b1b5cd6d24363754a78988ef From bc48a6b488fd0336933fcc973466d0ea8e821f01 Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Mon, 21 Aug 2017 16:47:56 -0700 Subject: [PATCH 5/7] Fix ios test with babel preset --- examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples b/examples index fce62ed59b..8226001c97 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit fce62ed59b417f99b1b5cd6d24363754a78988ef +Subproject commit 8226001c97d3e4c87f6c22e646fb93aaab51ecc9 From 42b8f9593304cc0c10cc5ca54e03da2a4a117619 Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Tue, 22 Aug 2017 10:53:38 -0700 Subject: [PATCH 6/7] Update react-native example --- examples | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples b/examples index 8226001c97..6cd2605230 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit 8226001c97d3e4c87f6c22e646fb93aaab51ecc9 +Subproject commit 6cd2605230a977d220dcbb4888fecfa7a415646b From 1dc3db0bd3810d223f1a967a84c6f0383831d529 Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Tue, 22 Aug 2017 14:59:03 -0700 Subject: [PATCH 7/7] Bump sentry-java to 1.5.1 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 0356d938c2..f5a7095950 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,5 +21,5 @@ android { dependencies { compile 'com.facebook.react:react-native:+' - compile 'io.sentry:sentry-android:1.5.0' + compile 'io.sentry:sentry-android:1.5.1' }