Upgrade to Gradle 4.8 (#1350)

Author: SUPERCILEX

build.gradle.kts

@@ -1,6 +1,6 @@
 import com.android.build.gradle.BaseExtension
 import com.jfrog.bintray.gradle.BintrayExtension
-import com.jfrog.bintray.gradle.RecordingCopyTask
+import com.jfrog.bintray.gradle.tasks.RecordingCopyTask
 import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
 import org.jfrog.gradle.plugin.artifactory.dsl.DoubleDelegateWrapper
 import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig
@@ -52,6 +52,10 @@ allprojects {
     }
 }
 
+tasks.withType<Wrapper> {
+    distributionType = Wrapper.DistributionType.ALL
+}
+
 val Project.configDir get() = "$rootDir/library/quality"
 val Project.reportsDir get() = "$buildDir/reports"
 
@@ -247,6 +251,50 @@ fun Project.setupPublishing() {
                 artifact(sourcesJar)
 
                 pom {
+                    name.set("FirebaseUI ${project.name.capitalize()}")
+                    description.set("Firebase UI for Android")
+                    url.set("https://github.com/firebase/FirebaseUI-Android")
+
+                    organization {
+                        name.set("Firebase")
+                        url.set("https://github.com/firebase")
+                    }
+
+                    scm {
+                        val scmUrl = "scm:git:[email protected]/firebase/firebaseui-android.git"
+                        connection.set(scmUrl)
+                        developerConnection.set(scmUrl)
+                        url.set(this@pom.url)
+                        tag.set("HEAD")
+                    }
+
+                    developers {
+                        developer {
+                            id.set("samtstern")
+                            name.set("Sam Stern")
+                            email.set("[email protected]")
+                            organization.set("Firebase")
+                            organizationUrl.set("https://firebase.google.com")
+                            roles.set(listOf("Project-Administrator", "Developer"))
+                            timezone.set("-8")
+                        }
+
+                        developer {
+                            id.set("SUPERCILEX")
+                            name.set("Alex Saveau")
+                            email.set("[email protected]")
+                            roles.set(listOf("Developer"))
+                            timezone.set("-8")
+                        }
+                    }
+
+                    licenses {
+                        license {
+                            name.set("The Apache License, Version 2.0")
+                            url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                        }
+                    }
+
                     withXml {
                         asNode().appendNode("dependencies").apply {
                             fun Dependency.write(scope: String) = appendNode("dependency").apply {
@@ -267,54 +315,6 @@ fun Project.setupPublishing() {
                                 dependency.write("runtime")
                             }
                         }
-
-                        // Common values
-                        val repoUrl = "https://github.com/firebase/FirebaseUI-Android"
-                        val scmUrl = "scm:git:[email protected]/firebase/firebaseui-android.git"
-
-                        // Name
-                        asNode().appendNode("name", artifactId)
-
-                        // Description
-                        asNode().appendNode("description", "Firebase UI for Android")
-
-                        // Organization
-                        asNode().appendNode("organization").apply {
-                            appendNode("name", "FirebaseUI")
-                            appendNode("url", repoUrl)
-                        }
-
-                        // URL
-                        asNode().appendNode("url", repoUrl)
-
-                        // SCM
-                        asNode().appendNode("scm").apply {
-                            appendNode("connection", scmUrl)
-                            appendNode("developerConnection", scmUrl)
-                            appendNode("url", repoUrl)
-                            appendNode("tag", "HEAD")
-                        }
-
-                        // Developers
-                        asNode().appendNode("developers").appendNode("developer").apply {
-                            appendNode("id", "samtstern")
-                            appendNode("email", "[email protected]")
-                            appendNode("organization", "Firebase")
-                            appendNode("organizationUrl", "https://firebase.google.com")
-
-                            appendNode("roles").apply {
-                                appendNode("role", "Project-Administrator")
-                                appendNode("role", "Developer")
-                            }
-
-                            appendNode("timezone", "-8")
-                        }
-
-                        // Licenses
-                        asNode().appendNode("licenses").appendNode("license").apply {
-                            appendNode("name", "The Apache License, Version 2.0")
-                            appendNode("url", "http://www.apache.org/licenses/LICENSE-2.0.txt")
-                        }
                     }
                 }
             }
@@ -356,16 +356,16 @@ fun Project.setupPublishing() {
             "'$name': ${publishing.artifacts}"
         }
         logger.info("""
-                |Bintray configuration for '$publicationName'
-                |    Artifact name: $artifactName
-                |    Artifacts: ${publications.joinToString(transform = pubLog)}
-            """.trimMargin())
+            |Bintray configuration for '$publicationName'
+            |    Artifact name: $artifactName
+            |    Artifacts: ${publications.joinToString(transform = pubLog)}
+        """.trimMargin())
         logger.info("""
-                |POM transformation
-                |    Src: $pomSrc
-                |    Dest: $pomDest
-                |    Name: $pomName
-            """.trimMargin())
+            |POM transformation
+            |    Src: $pomSrc
+            |    Dest: $pomDest
+            |    Name: $pomName
+        """.trimMargin())
 
         filesSpec(closureOf<RecordingCopyTask> {
             from(pomSrc)

buildSrc/src/main/kotlin/Config.kt

@@ -1,5 +1,5 @@
 object Config {
-    const val version = "4.0.1"
+    const val version = "4.1.0-SNAPSHOT"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "1.2.41"
@@ -11,11 +11,11 @@ object Config {
     }
 
     object Plugins {
-        const val android = "com.android.tools.build:gradle:3.2.0-alpha15"
+        const val android = "com.android.tools.build:gradle:3.2.0-alpha17"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         const val google = "com.google.gms:google-services:4.0.1"
 
-        const val bintray = "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"
+        const val bintray = "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1"
         const val buildInfo = "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.3"
     }
 
@@ -35,7 +35,7 @@ object Config {
             const val cardView = "com.android.support:cardview-v7:$version"
             const val customTabs = "com.android.support:customtabs:$version"
 
-            const val constraint = "com.android.support.constraint:constraint-layout:1.1.0"
+            const val constraint = "com.android.support.constraint:constraint-layout:1.1.1"
         }
 
         object Arch {
@@ -95,7 +95,7 @@ object Config {
         }
 
         object Lint {
-            private const val version = "26.2.0-alpha15"
+            private const val version = "26.2.0-alpha17"
 
             const val api = "com.android.tools.lint:lint-api:$version"
             const val tests = "com.android.tools.lint:lint-tests:$version"

gradle/wrapper/gradle-wrapper.jar

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