Gradle 4.7 revert

Change-Id: I55765eb1a87c5d9bd4aafa5e465c6a626eb84afa

Author: samtstern

build.gradle.kts

@@ -245,50 +245,6 @@ fun Project.setupPublishing() {
                 println("\taar: $releaseAar")
 
                 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 {
@@ -309,6 +265,54 @@ 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")
+                        }
                     }
                 }
             }

gradle/wrapper/gradle-wrapper.properties

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