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.

Sign up for GitHub

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

Ensure proguard files are included in AAR #1096

Merged
merged 4 commits into from
Jan 27, 2021
Merged

Ensure proguard files are included in AAR #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46ddf49
fix: alter gradle script to ensure proguard files are included in AAR
fractalwrench Jan 27, 2021
e5d8f9d
docs: add changelog entry
fractalwrench Jan 27, 2021
bc06825
Test improvements
twometresteve Jan 27, 2021
b330a49
Merge branch 'fix-proguard-packaging' of github.com:bugsnag/bugsnag-a…
twometresteve Jan 27, 2021
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
74 changes: 4 additions & 70 deletions .buildkite/pipeline.full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand Down Expand Up @@ -84,56 +83,6 @@ steps:
concurrency: 9
concurrency_group: 'browserstack-app'

- label: ':android: Android 4.4 NDK r16 end-to-end tests - batch 1'
depends_on:
- "fixture-r16"
- "android-4-4-smoke"
timeout_in_minutes: 90
plugins:
artifacts#v1.2.0:
download: "build/release/fixture-r16.apk"
docker-compose#v3.7.0:
run: android-maze-runner
command:
- "features/full_tests/batch_1"
- "--app=/app/build/release/fixture-r16.apk"
- "--farm=bs"
- "--device=ANDROID_4_4"
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'
# TODO: 2021/01/20 Currently experiencing issues with Appium session stability
soft_fail:
- exit_status: "*"

- label: ':android: Android 4.4 NDK r16 end-to-end tests - batch 2'
depends_on:
- "fixture-r16"
- "android-4-4-smoke"
timeout_in_minutes: 90
plugins:
artifacts#v1.2.0:
download: "build/release/fixture-r16.apk"
docker-compose#v3.7.0:
run: android-maze-runner
command:
- "features/full_tests/batch_2"
- "--app=/app/build/release/fixture-r16.apk"
- "--farm=bs"
- "--device=ANDROID_4_4"
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'
# TODO: 2021/01/20 Currently experiencing issues with Appium session stability
soft_fail:
- exit_status: "*"

- label: ':android: Android 5 NDK r16 end-to-end tests - batch 1'
depends_on:
- "fixture-r16"
Expand All @@ -152,9 +101,10 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'
soft_fail:
- exit_status: "*"

- label: ':android: Android 5 NDK r16 end-to-end tests - batch 2'
depends_on:
Expand All @@ -174,9 +124,10 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'
soft_fail:
- exit_status: "*"

- label: ':android: Android 6 NDK r16 end-to-end tests - batch 1'
depends_on:
Expand All @@ -196,7 +147,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -218,7 +168,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -240,7 +189,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -262,7 +210,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -284,7 +231,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -306,7 +252,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -328,7 +273,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -350,7 +294,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -372,7 +315,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -394,7 +336,6 @@ steps:
- "--fail-fast"
- "--tags"
- "not @Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -419,7 +360,6 @@ steps:
- "--farm=bs"
- "--device=ANDROID_4_4"
- "--tags=@Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -441,7 +381,6 @@ steps:
- "--farm=bs"
- "--device=ANDROID_5_0"
- "--tags=@Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -463,7 +402,6 @@ steps:
- "--farm=bs"
- "--device=ANDROID_6_0"
- "--tags=@Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -485,7 +423,6 @@ steps:
- "--farm=bs"
- "--device=ANDROID_7_1"
- "--tags=@Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -507,7 +444,6 @@ steps:
- "--farm=bs"
- "--device=ANDROID_8_1"
- "--tags=@Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -529,7 +465,6 @@ steps:
- "--farm=bs"
- "--device=ANDROID_10_0"
- "--tags=@Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand All @@ -551,6 +486,5 @@ steps:
- "--farm=bs"
- "--device=ANDROID_11_0"
- "--tags=@Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'
1 change: 0 additions & 1 deletion .buildkite/pipeline.quick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ steps:
- "--farm=bs"
- "--device=ANDROID_9_0"
- "--tags=@Flaky"
- "--resilient"
concurrency: 9
concurrency_group: 'browserstack-app'

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 5.5.2 (2021-01-27)

* Ensure proguard files are included in AAR
[#1096](https://github.com/bugsnag/bugsnag-android/pull/1096)

## 5.5.1 (2021-01-21)

* Alter ANR SIGQUIT handler to stop interfering with Google's ANR reporting, and to avoid unsafe JNI calls from within a signal handler
Expand Down
1 change: 1 addition & 0 deletions bugsnag-android-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig.minSdkVersion rootProject.ext.minSdkVersion
ndkVersion rootProject.ext.ndkVersion
defaultConfig.consumerProguardFiles = ["proguard-rules.pro"]

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand Down
2 changes: 1 addition & 1 deletion bugsnag-android-core/src/main/java/com/bugsnag/android/Notifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import java.io.IOException
*/
class Notifier @JvmOverloads constructor(
var name: String = "Android Bugsnag Notifier",
var version: String = "5.5.1",
var version: String = "5.5.2",
var url: String = "https://bugsnag.com"
) : JsonStream.Streamable {

Expand Down
1 change: 1 addition & 0 deletions bugsnag-android-ndk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig.minSdkVersion rootProject.ext.minSdkVersion
ndkVersion rootProject.ext.ndkVersion
defaultConfig.consumerProguardFiles = ["proguard-rules.pro"]

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand Down
1 change: 1 addition & 0 deletions bugsnag-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig.minSdkVersion rootProject.ext.minSdkVersion
ndkVersion rootProject.ext.ndkVersion
defaultConfig.consumerProguardFiles = ["proguard-rules.pro"]

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand Down
1 change: 1 addition & 0 deletions bugsnag-plugin-android-anr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ apply plugin: "org.jlleitschuh.gradle.ktlint"
android {
compileSdkVersion rootProject.ext.compileSdkVersion
ndkVersion rootProject.ext.ndkVersion
defaultConfig.consumerProguardFiles = ["proguard-rules.pro"]

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
1 change: 1 addition & 0 deletions bugsnag-plugin-android-ndk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ apply plugin: "org.jlleitschuh.gradle.ktlint"
android {
compileSdkVersion rootProject.ext.compileSdkVersion
ndkVersion rootProject.ext.ndkVersion
defaultConfig.consumerProguardFiles = ["proguard-rules.pro"]

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
1 change: 1 addition & 0 deletions bugsnag-plugin-react-native/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig.minSdkVersion rootProject.ext.minSdkVersion
ndkVersion rootProject.ext.ndkVersion
defaultConfig.consumerProguardFiles = ["proguard-rules.pro"]

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
Expand Down
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ private void configureAndroidProject(Project proj) {

def defaultConfig = proj.android.defaultConfig
defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
defaultConfig.consumerProguardFiles = ["proguard-rules.pro"]

proj.android.testOptions.unitTests.all {
testLogging {
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ services:
BUILDKITE_REPO:

android-maze-runner:
# TODO: Update to latest-v4-cli
image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:tms-corrections-for-notifiers-cli
image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v4-cli
environment:
DEBUG:
BUILDKITE:
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx4096m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
org.gradle.parallel=true
VERSION_NAME=5.5.1
VERSION_NAME=5.5.2
GROUP=com.bugsnag
POM_SCM_URL=https://github.com/bugsnag/bugsnag-android
POM_SCM_CONNECTION=scm:[email protected]:bugsnag/bugsnag-android.git
Expand Down