Merge branch 'trunk' into build-performance

build.gradle

@@ -208,3 +208,4 @@ tasks.register("configureApply") {
 }
 
 apply from: './config/gradle/jacoco.gradle'
+apply from: './config/gradle/gradle_build_scan.gradle'

config/gradle/gradle_build_cache.gradle

@@ -0,0 +1,12 @@
+
+// Only run build cache on CI builds.
+if (System.getenv('CI')) {
+    buildCache {
+        remote(HttpBuildCache) {
+            url = "http://10.0.2.215:5071/cache/"
+            allowUntrustedServer = true
+            allowInsecureProtocol = true
+            push = true
+        }
+    }
+}

config/gradle/gradle_build_scan.gradle

@@ -0,0 +1,11 @@
+
+// Only run build scan on CI builds.
+if (System.getenv('CI')) {
+    buildScan {
+        termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+        termsOfServiceAgree = 'yes'
+        tag 'CI'
+        publishAlways()
+        uploadInBackground = false
+    }
+}

settings.gradle

@@ -39,31 +39,6 @@ pluginManagement {
 
 plugins {
     id 'com.gradle.enterprise' version '3.9'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.6.5'
-}
-
-gradleEnterprise {
-    server = "https://gradle.a8c.com"
-    allowUntrustedServer = false
-    buildScan {
-        def disableGE = System.getenv("GRADLE_ENTERPRISE_ANALYTICS_DISABLE")
-        if (!(disableGE == "1" || disableGE == "true")) {
-            publishAlways()
-        }
-        capture {
-            taskInputFiles = true
-        }
-        uploadInBackground = System.getenv("CI") == null
-
-        if (!System.getenv().containsKey("CI")) {
-            // Obfuscate personal data unless it's a CI build
-            obfuscation {
-                username { username -> System.getenv("GRADLE_ENTERPRISE_ANALYTICS_USERNAME") ?: username }
-                hostname { hostname -> System.getenv("GRADLE_ENTERPRISE_ANALYTICS_HOSTNAME") ?: hostname }
-                ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0"} }
-            }
-        }
-    }
 }
 
 rootProject.name = 'WCAndroid'
@@ -89,3 +64,4 @@ gradle.ext {
 }
 
 apply from: './config/gradle/include_builds.gradle'
+apply from: './config/gradle/gradle_build_cache.gradle'