From fd601ae169b7cd0632eaca6b219f7e2ad3780bf2 Mon Sep 17 00:00:00 2001
From: Dmitri Davydok <ddv239@users.noreply.github.com>
Date: Mon, 26 Feb 2018 10:35:46 -0800
Subject: [PATCH] Upgrade Gradle (#719)

---
 README.md                                |  3 ++-
 app/build.gradle                         |  1 -
 build.gradle                             | 10 ++++++----
 gradle/wrapper/gradle-wrapper.properties | 14 +++++++-------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 4c05b2e8..2c00f420 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,9 @@ To build you will need:
  * A Java compiler compatible with Java 1.8
  * The Android SDK with platform 26 installed
 
-Building from command-line #1
+Building from command-line
 --------------------------
+> Note: at the time of this writing, the current version of Gradle ([4.5.1](https://gradle.org/releases/)) is not compatible with the current version of JDK ([9.0.4](http://www.oracle.com/technetwork/java/javase/downloads/jdk9-downloads-3848520.html)). To have the build succeed, use JDK version [1.8.0_162](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html).
  * `gradle build` to build the APK
  * Optional: `gradle installDebug` to install the APK to a connected device
 
diff --git a/app/build.gradle b/app/build.gradle
index 3cc95901..676d9b2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,6 @@ android {
     }
 
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "ch.blinkenlights.android.vanilla"
diff --git a/build.gradle b/build.gradle
index 0baf69e9..b852b1bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,15 @@
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 allprojects {
-   repositories {
-       jcenter()
-   }
+    repositories {
+        google()
+        jcenter()
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 08a6a919..62992616 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Sun May 28 17:31:34 MSK 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
-distributionSha256Sum=71a787faed83c4ef21e8464cc8452b941b5fcd575043aa29d39d15d879be89f7
+#Mon Feb 19 16:01:33 PST 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionSha256Sum=5c07b3bac2209fbc98fb1fdf6fd831f72429cdf8c503807404eae03d8c8099e5