Merge pull request #139 from bugsnag/create-debug-tasks

Create tasks for debug variant which are not run by default
bugsnag · Dec 11, 2018 · 368964a · 368964a
2 parents 493b1e0 + 3941e66
commit 368964a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.X.X (TBD)
+
+* Create tasks for debug variant which are not run by default
+[#139](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/139)
+
 ## 3.5.0 (2018-10-18)
 
 ### Bug fixes

diff --git a/src/main/groovy/com/bugsnag/android/gradle/BugsnagPlugin.groovy b/src/main/groovy/com/bugsnag/android/gradle/BugsnagPlugin.groovy
@@ -115,19 +115,21 @@ class BugsnagPlugin implements Plugin<Project> {
         setupProguardAutoConfig(project, variant)
 
         variant.outputs.each { output ->
-            if (!output.name.toLowerCase().endsWith("debug") || project.bugsnag.uploadDebugBuildMappings) {
-                BugsnagTaskDeps deps = new BugsnagTaskDeps()
-                deps.variant = variant
-                deps.output = output
-
-                setupManifestUuidTask(project, deps)
-                setupMappingFileUpload(project, deps)
-                setupNdkMappingFileUpload(project, deps)
-                setupReleasesTask(project, deps)
-            }
+            BugsnagTaskDeps deps = new BugsnagTaskDeps()
+            deps.variant = variant
+            deps.output = output
+
+            setupManifestUuidTask(project, deps)
+            setupMappingFileUpload(project, deps)
+            setupNdkMappingFileUpload(project, deps)
+            setupReleasesTask(project, deps)
         }
     }
 
+    private static boolean shouldUploadDebugMappings(Project project, BaseVariantOutput output) {
+        !output.name.toLowerCase().endsWith("debug") || project.bugsnag.uploadDebugBuildMappings
+    }
+
     /**
      * Creates a bugsnag task to upload proguard mapping file
      */
@@ -166,11 +168,13 @@ class BugsnagPlugin implements Plugin<Project> {
         def releasesTask = project.tasks.create("bugsnagRelease${taskNameForOutput(deps.output)}Task", BugsnagReleasesTask)
         setupBugsnagTask(releasesTask, deps)
 
-        findAssembleTasks(deps.output, project).forEach {
-            releasesTask.mustRunAfter it
+        if (shouldUploadDebugMappings(project, deps.output)) {
+            findAssembleTasks(deps.output, project).forEach {
+                releasesTask.mustRunAfter it
 
-            if (project.bugsnag.autoReportBuilds) {
-                it.finalizedBy releasesTask
+                if (project.bugsnag.autoReportBuilds) {
+                    it.finalizedBy releasesTask
+                }
             }
         }
     }
@@ -185,11 +189,13 @@ class BugsnagPlugin implements Plugin<Project> {
         setupBugsnagTask(uploadTask, deps)
         uploadTask.applicationId = deps.variant.applicationId
 
-        findAssembleTasks(deps.output, project).forEach {
-            uploadTask.mustRunAfter it
+        if (shouldUploadDebugMappings(project, deps.output)) {
+            findAssembleTasks(deps.output, project).forEach {
+                uploadTask.mustRunAfter it
 
-            if (project.bugsnag.autoUpload) {
-                it.finalizedBy uploadTask
+                if (project.bugsnag.autoUpload) {
+                    it.finalizedBy uploadTask
+                }
             }
         }
     }