From faad9ea5ab2bc5418a6dd8fe39cfab1413a89801 Mon Sep 17 00:00:00 2001
From: Greg Wicks <gpwicks@email.wm.edu>
Date: Thu, 26 Oct 2017 20:59:18 -0400
Subject: [PATCH 1/2] Android: Update gradle version

---
 Source/Android/build.gradle                             | 2 +-
 Source/Android/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle
index aac9f5bae5..899a66a2ef 100644
--- a/Source/Android/build.gradle
+++ b/Source/Android/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 
diff --git a/Source/Android/gradle/wrapper/gradle-wrapper.properties b/Source/Android/gradle/wrapper/gradle-wrapper.properties
index 3fb98131ed..50feb93e15 100644
--- a/Source/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Source/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Mar 04 15:47:41 CET 2017
+#Thu Oct 26 18:12:18 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

From cf57e909863634311610ab26125560d854d4636f Mon Sep 17 00:00:00 2001
From: Greg Wicks <gpwicks@email.wm.edu>
Date: Fri, 27 Oct 2017 13:06:48 -0400
Subject: [PATCH 2/2] Android: Update dependencies to use new format

---
 Source/Android/app/build.gradle | 16 ++++++++--------
 Source/Android/build.gradle     |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
index ae502037b1..3dc43ee8b0 100644
--- a/Source/Android/app/build.gradle
+++ b/Source/Android/app/build.gradle
@@ -75,22 +75,22 @@ ext {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:$androidSupportVersion"
-    compile "com.android.support:cardview-v7:$androidSupportVersion"
-    compile "com.android.support:recyclerview-v7:$androidSupportVersion"
-    compile "com.android.support:design:$androidSupportVersion"
+    api "com.android.support:support-v13:$androidSupportVersion"
+    api "com.android.support:cardview-v7:$androidSupportVersion"
+    api "com.android.support:recyclerview-v7:$androidSupportVersion"
+    api "com.android.support:design:$androidSupportVersion"
 
     // Android TV UI libraries.
-    compile "com.android.support:leanback-v17:$androidSupportVersion"
+    api "com.android.support:leanback-v17:$androidSupportVersion"
 
     // For showing the banner as a circle a-la Material Design Guidelines
-    compile 'de.hdodenhof:circleimageview:2.1.0'
+    api 'de.hdodenhof:circleimageview:2.1.0'
 
     // For loading huge screenshots from the disk.
-    compile 'com.squareup.picasso:picasso:2.5.2'
+    api 'com.squareup.picasso:picasso:2.5.2'
 
     // Allows FRP-style asynchronous operations in Android.
-    compile 'io.reactivex:rxandroid:1.2.1'
+    api 'io.reactivex:rxandroid:1.2.1'
 }
 
 def getVersion() {
diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle
index 899a66a2ef..5564f3fa9b 100644
--- a/Source/Android/build.gradle
+++ b/Source/Android/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0'
@@ -10,8 +11,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
     }
 }