Merge pull request #263 from bugsnag/v5-enabled-flag

Respect bugsnag.enabled flag when registering tasks
bugsnag · Aug 13, 2020 · dda0ce4 · dda0ce4
2 parents d7511f0 + 22c1035
commit dda0ce4
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 47 deletions.
diff --git a/features/disabled_bugsnag.feature b/features/disabled_bugsnag.feature
@@ -0,0 +1,5 @@
+Feature: Bugsnag disabled
+
+Scenario: No requests are received when bugsnag is disabled
+    When I build "default_app" using the "disabled_bugsnag" bugsnag config
+    Then I should receive 0 requests
diff --git a/features/fixtures/app/module/build.gradle b/features/fixtures/app/module/build.gradle
@@ -5,9 +5,7 @@ def bugsnagConfig = System.env.BUGSNAG_CONFIG ?: "standard"
 apply from: "../../config/android/${moduleConfig}.gradle"
 
 if (!System.env.UPDATING_GRADLEW) {
-    // apply config first (not overwritten by applying bugsnag plugin)
-    apply from: "../../config/bugsnag/${bugsnagConfig}.gradle"
 
     // apply bugsnag plugin configuration (e.g. custom sourceControl info)
-    apply plugin: 'com.bugsnag.android.gradle'
+    apply from: "../../config/bugsnag/${bugsnagConfig}.gradle"
 }
diff --git a/features/fixtures/config/bugsnag/all_disabled.gradle b/features/fixtures/config/bugsnag/all_disabled.gradle
@@ -1,6 +1,8 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.uploadJvmMappings = false
-    project.bugsnag.reportBuilds = false
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    uploadJvmMappings = false
+    reportBuilds = false
 }
diff --git a/features/fixtures/config/bugsnag/auto_report_builds_disabled.gradle b/features/fixtures/config/bugsnag/auto_report_builds_disabled.gradle
@@ -1,5 +1,7 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.reportBuilds = false
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    reportBuilds = false
 }
diff --git a/features/fixtures/config/bugsnag/custom_build_info.gradle b/features/fixtures/config/bugsnag/custom_build_info.gradle
@@ -1,16 +1,18 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.uploadJvmMappings = false
+apply plugin: 'com.bugsnag.android.gradle'
 
-    project.bugsnag.builderName = "Mark Twain"
-    project.bugsnag.sourceControl.provider = "bitbucket"
-    project.bugsnag.sourceControl.repository = "https://example.com/bar/foo.git"
-    project.bugsnag.sourceControl.revision = "fab8721"
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    uploadJvmMappings = false
+
+    builderName = "Mark Twain"
+    sourceControl.provider = "bitbucket"
+    sourceControl.repository = "https://example.com/bar/foo.git"
+    sourceControl.revision = "fab8721"
 
     def map = new HashMap()
     map.put("MyKey", "MyValue")
     map.put("os_version", "BeOS")
-    project.bugsnag.metadata = map
+    metadata = map
 
 }
diff --git a/features/fixtures/config/bugsnag/disabled_bugsnag.gradle b/features/fixtures/config/bugsnag/disabled_bugsnag.gradle
@@ -0,0 +1,7 @@
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    enabled = false
+}
diff --git a/features/fixtures/config/bugsnag/disabled_build_type.gradle b/features/fixtures/config/bugsnag/disabled_build_type.gradle
@@ -1,9 +1,11 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
 
     // disable bugsnag plugin for 'release' buildType
-    project.bugsnag.variantFilter { variant ->
+    variantFilter { variant ->
         if (variant.name.toLowerCase().contains("release")) {
             enabled = false
         }

diff --git a/features/fixtures/config/bugsnag/disabled_product_flavor.gradle b/features/fixtures/config/bugsnag/disabled_product_flavor.gradle
@@ -1,9 +1,11 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
 
     // disable bugsnag plugin for 'foo' productFlavor
-    project.bugsnag.variantFilter { variant ->
+    variantFilter { variant ->
         if (variant.name.toLowerCase().contains("foo")) {
             enabled = false
         }

diff --git a/features/fixtures/config/bugsnag/empty_api_key.gradle b/features/fixtures/config/bugsnag/empty_api_key.gradle
@@ -6,7 +6,9 @@ android {
     }
 }
 
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
 }
diff --git a/features/fixtures/config/bugsnag/overwrite_enabled.gradle b/features/fixtures/config/bugsnag/overwrite_enabled.gradle
@@ -1,6 +1,8 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.reportBuilds = false
-    project.bugsnag.overwrite = true
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    reportBuilds = false
+    overwrite = true
 }
diff --git a/features/fixtures/config/bugsnag/standard.gradle b/features/fixtures/config/bugsnag/standard.gradle
@@ -1,4 +1,6 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
 }
diff --git a/features/fixtures/config/bugsnag/upload_debug_enabled.gradle b/features/fixtures/config/bugsnag/upload_debug_enabled.gradle
@@ -1,5 +1,7 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
-    project.bugsnag.uploadDebugBuildMappings = true
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    releasesEndpoint = "http://localhost:${System.env.MOCK_API_PORT}"
+    uploadDebugBuildMappings = true
 }
diff --git a/features/fixtures/config/bugsnag/wrong_endpoint.gradle b/features/fixtures/config/bugsnag/wrong_endpoint.gradle
@@ -1,4 +1,6 @@
-project.afterEvaluate {
-    project.bugsnag.endpoint = "http://localhost:12345"
-    project.bugsnag.releasesEndpoint = "http://localhost:12345"
+apply plugin: 'com.bugsnag.android.gradle'
+
+bugsnag {
+    endpoint = "http://localhost:12345"
+    releasesEndpoint = "http://localhost:12345"
 }
diff --git a/src/main/kotlin/com/bugsnag/android/gradle/BugsnagPlugin.kt b/src/main/kotlin/com/bugsnag/android/gradle/BugsnagPlugin.kt
@@ -83,6 +83,9 @@ class BugsnagPlugin : Plugin<Project> {
             if (BugsnagManifestUuidTaskV2.isApplicable()) {
                 check(android is CommonExtension<*, *, *, *, *, *, *, *>)
                 android.onVariants {
+                    if (!bugsnag.enabled.get()) {
+                        return@onVariants
+                    }
                     val variant = VariantFilterImpl(name)
                     if (!isVariantEnabled(bugsnag, variant)) {
                         return@onVariants
@@ -108,6 +111,9 @@ class BugsnagPlugin : Plugin<Project> {
             }
 
             project.afterEvaluate {
+                if (!bugsnag.enabled.get()) {
+                    return@afterEvaluate
+                }
                 android.applicationVariants.configureEach { variant ->
                     val filterImpl = VariantFilterImpl(variant.name)
                     if (!isVariantEnabled(bugsnag, filterImpl)) {