Unverified Commit 4c459fb8 authored by John David Taylor's avatar John David Taylor Committed by GitHub

Upgrade Gradle and Dagger... (#196)

Upgrades to Gradle and Dagger.  Fixes to stuff I broke.
parent ae6df606
......@@ -69,7 +69,8 @@ dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:support-annotations:23.2.1'
compile 'com.google.guava:guava:19.0'
// provided 'javax.annotation:javax.annotation-api:1.3.1'
gmsCompile 'com.google.android.gms:play-services-analytics:8.4.0'
gmsCompile 'com.google.android.gms:play-services-location:8.4.0'
compile "com.android.support:support-v4:26.1.0"
compile 'com.google.dagger:dagger:2.14.1'
provided 'javax.annotation:jsr250-api:1.0' // For annotations not in Android but needed by Dagger
......@@ -81,5 +82,6 @@ dependencies {
androidTestCompile 'org.easymock:easymock:2.5.2'
}
apply plugin: 'com.google.gms.google-services'
......@@ -5,7 +5,7 @@ dependencies {
compile project(path: ':app',configuration:'default')
compile 'com.google.guava:guava:21.0'
// TODO(jontayler): Terrible hack that should go when we revamp the tools.
compile files('../app/build/intermediates/classes/fdroid/release/')
compile files('../app/build/intermediates/classes/gms/release/')
compile fileTree(include: ['*.jar'], dir: 'libs')
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment