Merge pull request #170 from bugsnag/fix-artefact-lookup

Lookup shared object files correctly in new artefact IDs
bugsnag · Jul 17, 2019 · 5783928 · 5783928
2 parents 53b8d17 + 0a94ec7
commit 5783928
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.5.1 (2019-07-17)
+
+Lookup shared object files correctly in new artefact IDs
+[#170](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/170)
+
 ## 4.5.0 (2019-07-15)
 
 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`.

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group = com.bugsnag
-version = 4.5.0
+version = 4.5.1
 
 ANDROID_MIN_SDK_VERSION=14
 ANDROID_TARGET_SDK_VERSION=27

diff --git a/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy b/src/main/groovy/com/bugsnag/android/gradle/BugsnagNdkSetupTask.groovy
@@ -20,7 +20,11 @@ class BugsnagNdkSetupTask extends DefaultTask {
                 String identifier = it.id.componentIdentifier.toString()
                 List<String> soArtefacts = ["bugsnag-android", "bugsnag-android-ndk",
                                    "bugsnag-plugin-android-anr", "bugsnag-plugin-android-ndk",]
-                soArtefacts.contains(identifier) && it.file != null
+
+                boolean isBugsnagArtefact = soArtefacts.stream().anyMatch {
+                    identifier.contains(it)
+                }
+                isBugsnagArtefact && it.file != null
             }
             if (artifact) {
                 File artifactFile = artifact.file