From 6ef549abcac6db3f4d21f082abfa537661ae203a Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Fri, 12 Jul 2019 11:32:27 +0100 Subject: [PATCH 1/4] feat: update plugin to search for shared object files in new artefact locations --- .../com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy b/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy index ae334e8c..dce7bcc9 100644 --- a/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy +++ b/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy @@ -18,7 +18,9 @@ class BugsnagNdkSetupTask extends DefaultTask { }.each { config -> ResolvedArtifact artifact = config.resolvedConfiguration.resolvedArtifacts.find { String identifier = it.id.componentIdentifier.toString() - identifier.contains("bugsnag-android") && it.file != null + def soArtefacts = ["bugsnag-android", "bugsnag-android-ndk", + "bugsnag-plugin-android-anr", "bugsnag-plugin-android-ndk"] + soArtefacts.contains(identifier) && it.file != null } if (artifact) { File artifactFile = artifact.file From 646b698722ea35b74ccc93c9b0e72b0b4ec0a1b5 Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Fri, 12 Jul 2019 11:38:38 +0100 Subject: [PATCH 2/4] docs: add changelog entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a32c7026..00a111ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## TBD + +Update plugin to search for shared object files in new artefact locations +[#168](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/168) + ## 4.4.1 (2019-06-19) Skip uploading mapping files for shared objects which have no debug info From 52f407826750d6f08affedb25aa81648249e610f Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Fri, 12 Jul 2019 12:20:53 +0100 Subject: [PATCH 3/4] style: pass codenarc violations --- .../com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy b/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy index dce7bcc9..b39b3dbd 100644 --- a/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy +++ b/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy @@ -18,8 +18,8 @@ class BugsnagNdkSetupTask extends DefaultTask { }.each { config -> ResolvedArtifact artifact = config.resolvedConfiguration.resolvedArtifacts.find { String identifier = it.id.componentIdentifier.toString() - def soArtefacts = ["bugsnag-android", "bugsnag-android-ndk", - "bugsnag-plugin-android-anr", "bugsnag-plugin-android-ndk"] + List soArtefacts = ["bugsnag-android", "bugsnag-android-ndk", + "bugsnag-plugin-android-anr", "bugsnag-plugin-android-ndk",] soArtefacts.contains(identifier) && it.file != null } if (artifact) { From 1b30c04c42a4fee6d2761be21926106ef597fbea Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Fri, 12 Jul 2019 14:07:06 +0100 Subject: [PATCH 4/4] docs: adapt changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00a111ef..9c0f02c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## TBD -Update plugin to search for shared object files in new artefact locations +Search for shared object files in the new artefact locations introduced by modularisation of `bugsnag-android`. This affects versions v4.17.0 and above of `bugsnag-android` and `bugsnag-android-ndk`. [#168](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/168) ## 4.4.1 (2019-06-19)