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: Use new Android SDK #749

Merged
merged 10 commits into from
Feb 12, 2020
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,6 +1,3 @@
[submodule "examples"]
path = examples
url = https://github.com/getsentry/examples
[submodule "ios/Sentry"]
path = ios/Sentry
url=https://github.com/getsentry/sentry-cocoa
67 changes: 14 additions & 53 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,64 +7,25 @@ before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$PATH"

matrix:
include:
# - language: node_js
# node_js: 8
# env: LANE='node'
# cache:
# yarn: true
# script: .travis/run.sh
install: yarn --ignore-engines
os: linux

language: node_js
node_js: "12"
dist: bionic

- name: "Android"
language: android
sudo: required
jdk: oraclejdk8
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -rf $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.yarn-cache
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
before_install:
- nvm install 8
- .travis/before_install.sh
- echo yes | sdkmanager "platforms;android-26"
android:
components:
- tools
- platform-tools
- build-tools-28.0.3
- tools
env: LANE='android'
script: .travis/run.sh
cache:
yarn: true
directories:
- node_modules

- name: "iOS"
language: objective-c
os: osx
osx_image: xcode9.4
node_js: 8
cache:
- bundler
- pip
- yarn
env: LANE='ios'
before_install:
- .travis/before_install.sh
before_script:
- nvm install 8
- sudo easy_install virtualenv
- virtualenv ~/virtualenv
- source ~/virtualenv/bin/activate
script: .travis/run.sh
matrix:
include:
- name: "Test"
script: yarn test

- name: "Deploy"
language: node_js
node_js: 8
script: .travis/deploy.sh
env: LANE='Deploy'
after_success:
- npm install -g @zeus-ci/cli
- zeus upload -t "application/tar+npm" *.tgz
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 1.3.0

- Bump `io.sentry:sentry-android:2.0.0-rc04`
- Added support for Hermes runtime!!
- Fixed a lot of issues on Android
- NDK support

## 1.2.2

- fix(android): Crash if stacktrace.frames is empty (#742)
Expand Down
14 changes: 10 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def safeExtGet(prop, fallback) {
apply plugin: 'com.android.library'

android {
compileSdkVersion safeExtGet('compileSdkVersion', 26)
compileSdkVersion safeExtGet('compileSdkVersion', 28)
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')

defaultConfig {
Expand All @@ -14,19 +14,25 @@ android {

defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 16)
targetSdkVersion safeExtGet('targetSdkVersion', 26)
targetSdkVersion safeExtGet('targetSdkVersion', 28)
versionCode 1
versionName "1.0"
ndk {
abiFilters "armeabi-v7a", "x86"
abiFilters "x86", "armeabi-v7a", "x86_64", "arm64-v8a"
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

lintOptions {
warning 'InvalidPackage'
}
}

dependencies {
implementation 'com.facebook.react:react-native:+'
implementation 'io.sentry:sentry-android:1.7.29'
implementation 'io.sentry:sentry-android:2.0.0-rc04'
}
3 changes: 3 additions & 0 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
package="io.sentry">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application>
<meta-data android:name="io.sentry.auto-init" android:value="false" />
</application>
</manifest>
128 changes: 0 additions & 128 deletions android/src/main/java/io/sentry/ArrayUtil.java

This file was deleted.

Loading