Skip to content
This repository has been archived by the owner on Sep 28, 2018. It is now read-only.

Commit

Permalink
Merge pull request #19 from bugsnag/next
Browse files Browse the repository at this point in the history
Next release
  • Loading branch information
fractalwrench authored Jun 18, 2018
2 parents e047b54 + eebf817 commit af24ac9
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 10 deletions.
16 changes: 12 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,27 @@ android:
- extra-google-m2repository
- extra-android-m2repository

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache

before_install:
# see https://github.com/travis-ci/travis-ci/issues/8874
- ./install_ndk.sh
# see https://github.com/travis-ci/travis-ci/issues/8874
- yes | sdkmanager "platforms;android-27"
- echo y | sdkmanager "cmake;3.6.4111459"
- echo y | sdkmanager "ndk-bundle"
- echo y | sdkmanager "lldb;3.1"


env:
matrix:
- ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
- ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7a

script: ./gradlew checkstyle clean build

sudo: true
sudo: true
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## 1.2.0 (2018-06-18)

**IMPORTANT NOTE**: this release alters the behaviour of the notifier to track sessions automatically.
A session will be automatically captured on each app launch and sent to [https://sessions.bugsnag.com](https://sessions.bugsnag.com). If you
use Bugsnag On-Premise, it is now also recommended that you set your notify and session endpoints
via `config.setEndpoints(String notify, String sessions)`.

* Update bugsnag-android dependency version to v4.5.0:

* Enable automatic session tracking by default [#314](https://github.com/bugsnag/bugsnag-android/pull/314)

* Build bugsnag-android-ndk project with r16b [#20](https://github.com/bugsnag/bugsnag-android-ndk/pull/20)

## 1.1.3 (2018-04-16)

### Bug fixes
Expand Down
4 changes: 2 additions & 2 deletions example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'

repositories {
jcenter()
google()
jcenter()
}

allprojects {
Expand Down Expand Up @@ -66,7 +66,7 @@ android {
}
arm {
ndk {
abiFilters "armeabi-v7a", "armeabi"
abiFilters "armeabi-v7a"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_NAME=1.1.3
VERSION_NAME=1.2.0
GROUP=com.bugsnag
BUGSNAG_ANDROID_ARTIFACT_ID=bugsnag-android

Expand All @@ -22,4 +22,4 @@ ANDROID_BUILD_TOOLS_VERSION=27.0.0
ANDROID_COMPILE_SDK_VERSION=27
ANDROID_TARGET_SDK_VERSION=27
ANDROID_MIN_SDK_VERSION=14
BUGSNAG_ANDROID_VERSION=4.3.1
BUGSNAG_ANDROID_VERSION=4.5.0
19 changes: 19 additions & 0 deletions install_ndk.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash

export OS_VERSION='linux-x86_64'
export NDK_VERSION='r16b'

echo "Downloading NDK, this will take a while..."
wget -q https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-${OS_VERSION}.zip

echo "Unzipping NDK, this will take a while..."
unzip -q android-ndk-${NDK_VERSION}-${OS_VERSION}.zip

echo "Copying to ndk-bundle"
mv android-ndk-${NDK_VERSION} $ANDROID_HOME/ndk-bundle

export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
export ANDROID_NDK=$ANDROID_HOME/ndk-bundle

# add to PATH
export PATH=${PATH}:${ANDROID_NDK_HOME}
6 changes: 5 additions & 1 deletion ndk/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
apply plugin: 'com.android.library'

repositories {
jcenter()
google()
jcenter()

flatDir {
dirs 'libs'
}
}

android {
Expand Down
2 changes: 1 addition & 1 deletion ndk/src/main/jni/bugsnag_ndk_report.c
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ void bsg_populate_breadcrumbs(JNIEnv *env, bsg_event *event) {
jmethodID get_breadcrumbs_method = (*env)->GetStaticMethodID(env, interface_class, "getBreadcrumbs", "()[Ljava/lang/Object;");
jarray breadcrumbs_value = (*env)->CallStaticObjectMethod(env, interface_class, get_breadcrumbs_method);

jclass breadcrumb_class = (*env)->FindClass(env, "com/bugsnag/android/Breadcrumbs$Breadcrumb");
jclass breadcrumb_class = (*env)->FindClass(env, "com/bugsnag/android/Breadcrumb");
jfieldID timestamp_field = (*env)->GetFieldID(env, breadcrumb_class, "timestamp", "Ljava/lang/String;");
jfieldID name_field = (*env)->GetFieldID(env, breadcrumb_class, "name", "Ljava/lang/String;");
jfieldID type_field = (*env)->GetFieldID(env, breadcrumb_class, "type", "Lcom/bugsnag/android/BreadcrumbType;");
Expand Down

0 comments on commit af24ac9

Please sign in to comment.