Optimize build performance (#1422)

Author: samtstern

app/build.gradle.kts

@@ -7,7 +7,7 @@ android {
     }
 
     buildTypes {
-        getByName("release") {
+        named("release").configure {
             // For the purposes of the sample, allow testing of a proguarded release build
             // using the debug key
             signingConfig = signingConfigs["debug"]

auth/build.gradle.kts

@@ -1,9 +1,8 @@
-
 import com.android.build.gradle.internal.dsl.TestOptions
 
 android {
     buildTypes {
-        getByName("release") {
+        named("release").configure {
             postprocessing {
                 consumerProguardFiles("auth-proguard.pro")
             }

build.gradle.kts

@@ -24,9 +24,15 @@ buildscript {
 }
 
 plugins {
+    `build-scan` version "1.16"
     id("com.github.ben-manes.versions") version "0.20.0"
 }
 
+buildScan {
+    setTermsOfServiceUrl("https://gradle.com/terms-of-service")
+    setTermsOfServiceAgree("yes")
+}
+
 // See https://github.com/gradle/kotlin-dsl/issues/607#issuecomment-375687119
 subprojects { parent!!.path.takeIf { it != rootProject.path }?.let { evaluationDependsOn(it) } }
 
@@ -47,7 +53,7 @@ allprojects {
     }
 }
 
-tasks.withType<Wrapper> {
+tasks.withType<Wrapper>().configureEach {
     distributionType = Wrapper.DistributionType.ALL
 }
 
@@ -115,10 +121,10 @@ fun Project.configureQuality() {
     apply(plugin = "checkstyle")
 
     configure<CheckstyleExtension> { toolVersion = "8.10.1" }
-    check { dependsOn("checkstyle") }
+    tasks.named("check").configure { dependsOn("checkstyle") }
 
-    task<Checkstyle>("checkstyle") {
-        configFile = file("$configDir/checkstyle.xml")
+    tasks.register<Checkstyle>("checkstyle") {
+        configFile = file("${project.configDir}/checkstyle.xml")
         source("src")
         include("**/*.java")
         exclude("**/gen/**")
@@ -127,85 +133,77 @@ fun Project.configureQuality() {
 }
 
 fun Project.setupPublishing() {
-    val sourcesJar = task<Jar>("sourcesJar") {
+    val sourcesJar = tasks.register<Jar>("sourcesJar") {
         classifier = "sources"
         from(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
     }
 
-    val javadoc = task<Javadoc>("javadoc") {
-        afterEvaluate {
-            dependsOn(project.the<LibraryExtension>().libraryVariants.map { it.assemble })
+    val javadoc = tasks.register<Javadoc>("javadoc") {
+        setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
+        classpath += files(project.the<BaseExtension>().bootClasspath)
 
-            setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
-            classpath += files(project.the<BaseExtension>().bootClasspath)
-            classpath += files(project.the<LibraryExtension>().libraryVariants.map {
-                (it.javaCompiler as AbstractCompile).classpath
-            })
+        project.the<LibraryExtension>().libraryVariants.configureEach {
+            dependsOn(assemble)
+            classpath += files((javaCompiler as AbstractCompile).classpath)
         }
 
         // Ignore warnings about incomplete documentation
         (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
     }
 
-    val javadocJar = task<Jar>("javadocJar") {
+    val javadocJar = tasks.register<Jar>("javadocJar") {
         dependsOn(javadoc)
         classifier = "javadoc"
-        from(javadoc.destinationDir)
+        from(javadoc.get().destinationDir)
     }
 
     artifacts.add("archives", javadocJar)
     artifacts.add("archives", sourcesJar)
 
-    tasks.whenTaskAdded {
-        if (name.contains("publish") && name.contains("publication", true)) {
-            dependsOn("assembleRelease")
-        }
-    }
-
     afterEvaluate {
         if (isLibrary) {
-            task("testAll") {
+            tasks.register("testAll") {
                 dependsOn(*Config.submodules.map {
                     ":$it:testDebugUnitTest"
                 }.toTypedArray())
             }
 
-            task("prepareArtifacts") {
+            tasks.register("prepareArtifacts") {
                 dependsOn(javadocJar, sourcesJar, "assembleRelease")
                 dependsOn("generatePomFileForMonolithLibraryPublication")
                 dependsOn(*Config.submodules.map {
                     ":$it:prepareArtifacts"
                 }.toTypedArray())
             }
 
-            task("publishAllToMavenLocal") {
+            tasks.register("publishAllToMavenLocal") {
                 dependsOn("publishMonolithLibraryPublicationToMavenLocal")
                 dependsOn(*Config.submodules.map {
                     ":$it:publish${it.capitalize()}LibraryPublicationToMavenLocal"
                 }.toTypedArray())
             }
 
-            task("publishAllToCustomLocal") {
+            tasks.register("publishAllToCustomLocal") {
                 dependsOn("publishMonolithLibraryPublicationToCustomLocalRepository")
                 dependsOn(*Config.submodules.map {
                     ":$it:publish${it.capitalize()}LibraryPublicationToCustomLocalRepository"
                 }.toTypedArray())
             }
 
-            task("bintrayUploadAll") {
+            tasks.register("bintrayUploadAll") {
                 dependsOn("bintrayUpload")
                 dependsOn(*Config.submodules.map {
                     ":$it:bintrayUpload"
                 }.toTypedArray())
             }
         } else {
             val pomTask = "generatePomFileFor${name.capitalize()}LibraryPublication"
-            task("prepareArtifacts") {
+            tasks.register("prepareArtifacts") {
                 dependsOn(javadocJar, sourcesJar, "assembleRelease", pomTask)
             }
         }
 
-        tasks["bintrayUpload"].dependsOn("prepareArtifacts")
+        tasks.named("bintrayUpload").configure { dependsOn("prepareArtifacts") }
     }
 
     apply(plugin = "maven-publish")
@@ -251,8 +249,8 @@ fun Project.setupPublishing() {
                 """.trimMargin())
 
                 artifact(releaseAar)
-                artifact(javadocJar)
-                artifact(sourcesJar)
+                artifact(javadocJar.get())
+                artifact(sourcesJar.get())
 
                 pom {
                     name.set("FirebaseUI ${project.name.capitalize()}")
@@ -325,6 +323,12 @@ fun Project.setupPublishing() {
         }
     }
 
+    tasks.matching {
+        it.name.contains("publish") && it.name.contains("publication", true)
+    }.configureEach {
+        dependsOn("assembleRelease")
+    }
+
     val bintrayUsername = properties["bintrayUser"] as String?
             ?: System.getProperty("BINTRAY_USER") ?: System.getenv("BINTRAY_USER")
     val bintrayKey = properties["bintrayKey"] as String?
@@ -341,7 +345,7 @@ fun Project.setupPublishing() {
         })
     }
 
-    tasks.withType<ArtifactoryTask> { publications(publicationName) }
+    tasks.withType<ArtifactoryTask>().configureEach { publications(publicationName) }
 
     configure<BintrayExtension> {
         user = bintrayUsername

buildSrc/src/main/kotlin/Projects.kt

@@ -1,4 +1,4 @@
-check { dependsOn("compileDebugAndroidTestJavaWithJavac") }
+tasks.named("check").configure { dependsOn("compileDebugAndroidTestJavaWithJavac") }
 
 android {
     defaultConfig {

database/build.gradle.kts

@@ -1,12 +1,12 @@
-check { dependsOn("compileDebugAndroidTestJavaWithJavac") }
+tasks.named("check").configure { dependsOn("compileDebugAndroidTestJavaWithJavac") }
 
 android {
     defaultConfig {
         testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
-        getByName("release") {
+        named("release").configure {
             postprocessing {
                 consumerProguardFiles("proguard-rules.pro")
             }

firestore/build.gradle.kts

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx6g -XX:ReservedCodeCacheSize=2g -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true

gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-rc-3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -10,7 +10,7 @@ dependencies {
     testImplementation(Config.Libs.Lint.tests)
 }
 
-tasks.withType<Jar> {
+tasks.withType<Jar>().configureEach {
     manifest {
         attributes(mapOf("Lint-Registry-v2" to "com.firebaseui.lint.LintIssueRegistry"))
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-check { dependsOn("testAll", "prepareArtifacts") }
+tasks.named("check").configure { dependsOn("testAll", "prepareArtifacts") }
 
 android {
     lintOptions {

internal/lint/build.gradle.kts

@@ -4,7 +4,7 @@ android {
     }
 
     buildTypes {
-        getByName("release") {
+        named("release").configure {
             // For the purposes of the sample, allow testing of a proguarded release build
             // using the debug key
             signingConfig = signingConfigs["debug"]