Skip to content

Commit ee8b7d3

Browse files
authored
Upgrade Android Gradle plugin so we can build with NDK 22 (#31)
* Upgrade Android Gradle plugin so we can build with NDK 22 * Update documentation * Fix version number * Update semvar for 3.4.0 release
1 parent 9ed6039 commit ee8b7d3

File tree

8 files changed

+16
-11
lines changed

8 files changed

+16
-11
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Backtrace Android Release Notes
22

3+
## Version 3.4.0 - 07.09.2021
4+
- Added support for NDK 22
35

46
## Version 3.3.0 - 15.07.2021
57
- Added support for client side unwinding of native crashes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ catch (e: Exception) {
7474
* Minimum SDK version 21 (Android 5.0)
7575
* Target SDK version 28 (Android 9.0)
7676
* Minimum NDK version 17c
77-
* Maximum NDK version 21
77+
* Maximum NDK version 22
7878

7979
# Supported platforms
8080
* arm32/arm64

backtrace-library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
defaultConfig {
88
minSdkVersion 21
99
targetSdkVersion 28
10-
versionCode 330
11-
versionName "3.3.0"
10+
versionCode 340
11+
versionName "3.4.0"
1212

1313
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1414

backtrace-library/src/main/java/backtraceio/library/models/BacktraceData.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,12 @@ private void setReportInformation() {
184184
timestamp = report.timestamp;
185185
classifiers = report.exceptionTypeReport ? new String[]{report.classifier} : null;
186186
langVersion = System.getProperty("java.version"); //TODO: Fix problem with read Java version
187-
agentVersion = BuildConfig.VERSION_NAME;
187+
try {
188+
agentVersion = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
189+
} catch (Exception e) {
190+
BacktraceLogger.e(LOG_TAG, "Could not resolve package version name");
191+
agentVersion = "";
192+
}
188193
}
189194

190195
/**

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.2.1'
10+
classpath 'com.android.tools.build:gradle:4.2.2'
1111

1212

1313
// NOTE: Do not place your application dependencies here; they belong

example-app/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ android {
88
targetSdkVersion 28
99
versionCode 1
1010
versionName "1.0"
11-
buildToolsVersion "28.0.2"
1211
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1312
}
1413
buildTypes {
@@ -24,8 +23,6 @@ android {
2423
version "3.10.2"
2524
}
2625
}
27-
28-
buildToolsVersion '28.0.3'
2926
}
3027

3128
dependencies {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ org.gradle.jvmargs=-Xmx1024m
1313
# org.gradle.parallel=true
1414

1515

16-
VERSION_NAME=3.3.0
17-
VERSION_CODE=330
16+
VERSION_NAME=3.4.0
17+
VERSION_CODE=340
1818
GROUP=com.github.backtrace-labs.backtrace-android
1919

2020
POM_DESCRIPTION=Backtrace's integration with Android applications written in Java allows customers to capture and report handled and unhandled java exceptions.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Thu Sep 02 16:28:56 EDT 2021
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip

0 commit comments

Comments
 (0)