From 7dcb333f150750bf16534109e36e83fa1bd799fb Mon Sep 17 00:00:00 2001
From: Varuni-Punchihewa <1995varuni@gmail.com>
Date: Thu, 27 Jun 2019 22:20:42 +0530
Subject: [PATCH] resolve build errors

---
 build.gradle                             |  4 ++++
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 opentripplanner-android/build.gradle     | 25 ++++++++++++------------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 18cfafcc..7e545b1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,4 +30,8 @@ subprojects {
             project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
         }
     }
+}
+
+repositories {
+    google()
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0e386991..9ff7d271 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 06 15:07:24 EDT 2016
+#Thu Jun 27 21:58:54 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/opentripplanner-android/build.gradle b/opentripplanner-android/build.gradle
index 757781b9..d4042ae6 100644
--- a/opentripplanner-android/build.gradle
+++ b/opentripplanner-android/build.gradle
@@ -17,9 +17,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 apply plugin: 'com.android.application'
@@ -34,11 +35,11 @@ repositories {
         // CUTR Releases
         url "https://github.com/CUTR-at-USF/cutr-mvn-repo/raw/master/releases"
     }
+    google()
 }
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.2"
 
     defaultConfig {
         versionCode 18
@@ -94,7 +95,7 @@ android {
     }
 }
 
-task askForPasswords << {
+task askForPasswords {
     // Must create String because System.readPassword() returns char[]
     // (and assigning that below fails silently)
     def storePw = new String(System.console().readPassword("\nKeystore password: "))
@@ -111,18 +112,18 @@ tasks.whenTaskAdded { theTask ->
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.0'
+    implementation 'com.android.support:support-v4:21.0.0'
     // Only include Google Play Services maps and location libraries
-    compile 'com.google.android.gms:play-services-maps:7.8.0'
-    compile 'com.google.android.gms:play-services-location:7.8.0'
+    implementation 'com.google.android.gms:play-services-maps:7.8.0'
+    implementation 'com.google.android.gms:play-services-location:7.8.0'
     // Jackson is used for parsing JSON REST API responses
-    compile 'com.fasterxml.jackson.core:jackson-core:2.4.1'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.4.1'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.4.1.1'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.4.1'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.4.1'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.4.1.1'
     // POJOs used for full data-binding via Jackson
-    compile 'edu.usf.cutr.opentripplanner.android:opentripplanner-pojos:1.0.0-SNAPSHOT'
+    implementation 'edu.usf.cutr.opentripplanner.android:opentripplanner-pojos:1.0.0-SNAPSHOT'
     // OpenCSV, for parsing the OTP Server Directory Google Doc
-    compile 'net.sf.opencsv:opencsv:2.3'
+    implementation 'net.sf.opencsv:opencsv:2.3'
     // Map util (point in bounding box)
-    compile 'com.google.maps.android:android-maps-utils:0.4'
+    implementation   'com.google.maps.android:android-maps-utils:0.4'
 }