Skip to content
This repository has been archived by the owner on May 27, 2024. It is now read-only.

Resolve build errors #496

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@ subprojects {
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
}
}
}

repositories {
google()
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
25 changes: 13 additions & 12 deletions opentripplanner-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down Expand Up @@ -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: "))
Expand All @@ -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'
}