Merge pull request #13343 from woocommerce/build/update-build-scans-c…

…onfig

[Gradle] Update Build Scans Config (`Develocity`)

WooCommerce/build.gradle

@@ -163,7 +163,7 @@ android {
     }
 
     lintOptions {
-        sarifReport System.getenv('CI') ? true : false
+        sarifReport gradle.ext.isCi
         checkDependencies true
         disable 'InvalidPackage'
     }

build.gradle

@@ -24,8 +24,6 @@ ext {
             file("${rootDir}/defaults.properties"),
             file("${System.getProperty("user.home")}/.configure/woocommerce-android/secrets/secrets.properties")
     )
-    userEnabledTracking = secretProperties.get('measureBuildsEnabled')?.toBoolean() ?: false
-
     developerProperties = loadPropertiesWithFallback(
             logger,
             file("${rootDir}/developer.properties-example"),
@@ -34,9 +32,9 @@ ext {
 }
 
 measureBuilds {
-    enable = userEnabledTracking
+    enable = secretProperties.get('measureBuildsEnabled')?.toBoolean() ?: false
     automatticProject = MeasureBuildsExtension.AutomatticProject.WooCommerce
-    attachGradleScanId = true
+    attachGradleScanId = false
     authToken = secretProperties.get('appsMetricsToken')
 }
 
@@ -114,4 +112,3 @@ tasks.register("installGitHooks", Copy) {
 }
 
 apply from: './config/gradle/jacoco.gradle'
-apply from: './config/gradle/gradle_build_scan.gradle'

config/gradle/gradle_build_cache.gradle

@@ -1,6 +1,6 @@
 
 // Only run build cache on CI builds.
-if (System.getenv('CI')) {
+if (gradle.ext.isCi) {
     buildCache {
         remote(HttpBuildCache) {
             url = "http://10.0.2.215:5071/cache/"

config/gradle/gradle_build_scan.gradle

@@ -1,19 +1,19 @@
-Boolean isBuildOnCI = (System.getenv('CI') ?: false).toBoolean()
 
-if (isBuildOnCI || userEnabledTracking) {
-    buildScan {
-        termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-        termsOfServiceAgree = 'yes'
-        publishAlways()
-        if (isBuildOnCI) {
+// Only run build scan on CI builds.
+if (gradle.ext.isCi) {
+    develocity {
+        buildScan {
+            termsOfUseUrl = 'https://gradle.com/terms-of-service'
+            termsOfUseAgree = 'yes'
             tag 'CI'
+            publishing.onlyIf { true }
             uploadInBackground = false
-        } else {
-            obfuscation {
-                username { username -> username.digest('SHA-1') }
-                hostname { _ -> "" }
-                ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0" } }
-            }
+        }
+    }
+} else {
+    develocity {
+        buildScan {
+            publishing.onlyIf { false }
         }
     }
 }

settings.gradle

@@ -17,9 +17,11 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gradle.enterprise' version '3.17.2'
+    id 'com.gradle.develocity' version '3.19'
 }
 
+gradle.ext.isCi = System.getenv('CI')?.toBoolean() ?: false
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -94,4 +96,5 @@ gradle.ext {
 
 apply from: './config/gradle/include_builds.gradle'
 apply from: './config/gradle/gradle_build_cache.gradle'
+apply from: './config/gradle/gradle_build_scan.gradle'
 include ':WooCommerce-Wear'