Cleanup Kotlin code

Add the google maven repository to the allrpeojcts section in addition
to the buildscript section.

Test: Manual

Change-Id: I2ea9dcb57e7e9dc816e5f5aa26b2bbcbaee658d0

3 files changed, 14 insertions, 16 deletions

diff --git a/ui/fonts/DownloadableFonts/build.gradle b/ui/fonts/DownloadableFonts/build.gradle
index 496b9ab9..39ebd646 100644
--- a/ui/fonts/DownloadableFonts/build.gradle
+++ b/ui/fonts/DownloadableFonts/build.gradle
@@ -3,17 +3,20 @@ buildscript {
     repositories {
         jcenter()
         maven {
-             url 'https://maven.google.com'
+            url 'https://maven.google.com'
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.4.0-alpha6'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha1'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com'
+        }
     }
 }
 
diff --git a/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt
index 1f6f679a..bcc50a4c 100644
--- a/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt
+++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt
@@ -31,18 +31,10 @@ internal class QueryBuilder(val familyName: String,
         }
         val builder = StringBuilder()
         builder.append("name=").append(familyName)
-        if (weight != null) {
-            builder.append("&weight=").append(weight)
-        }
-        if (width != null) {
-            builder.append("&width=").append(width)
-        }
-        if (italic != null) {
-            builder.append("&italic=").append(italic)
-        }
-        if (besteffort != null) {
-            builder.append("&besteffort=").append(besteffort)
-        }
+        weight?.let { builder.append("&weight=").append(weight) }
+        width?.let { builder.append("&width=").append(width) }
+        italic?.let { builder.append("&italic=").append(italic) }
+        besteffort?.let { builder.append("&besteffort=").append(besteffort) }
         return builder.toString()
     }
 }
diff --git a/ui/fonts/DownloadableFonts/kotlinApp/build.gradle b/ui/fonts/DownloadableFonts/kotlinApp/build.gradle
index 2df217d9..0c2b9546 100644
--- a/ui/fonts/DownloadableFonts/kotlinApp/build.gradle
+++ b/ui/fonts/DownloadableFonts/kotlinApp/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.1.2-3'
+    ext.kotlin_version = '1.1.2-4'
     repositories {
         jcenter()
         maven {
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.4.0-alpha6'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -16,6 +16,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com'
+        }
     }
 }