Skip to content

Commit

Permalink
Update dependencies (#51)
Browse files Browse the repository at this point in the history
* Update dependencies

* Update circle ci to api 26
  • Loading branch information
jraska authored Aug 4, 2017
1 parent 049fccd commit 3cd9acb
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
working_directory: ~/code
docker:
- image: circleci/android:api-25-alpha
- image: circleci/android:api-26-alpha
environment:
JVM_OPTS: -Xmx4096m
steps:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.2'
classpath 'me.tatarka:gradle-retrolambda:3.6.1'
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
classpath 'com.google.gms:google-services:3.1.0'
classpath 'com.google.firebase:firebase-plugins:1.1.0'
}
Expand All @@ -27,7 +27,7 @@ ext {
version = '0.5.0'
versionCode = 5
minSdkVersion = 21
compileSdkVersion = 25
compileSdkVersion = 26
targetSdkVersion = compileSdkVersion
buildToolsVersion = '25.0.2'
sourceCompatibility = JavaVersion.VERSION_1_8
Expand Down
8 changes: 4 additions & 4 deletions client-data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ dependencies {

compile project(':client-domain')

compile 'com.android.support:appcompat-v7:25.4.0'
compile 'com.android.support:support-annotations:25.4.0'
compile 'com.android.support:appcompat-v7:26.0.0'
compile 'com.android.support:support-annotations:26.0.0'

compile "android.arch.lifecycle:extensions:1.0.0-alpha3"
compile "android.arch.lifecycle:extensions:1.0.0-alpha8"

compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
Expand All @@ -38,5 +38,5 @@ dependencies {
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:3.8.0'
testCompile 'org.mockito:mockito-core:2.8.47'
testCompile 'com.android.support:support-annotations:25.4.0'
testCompile 'com.android.support:support-annotations:26.0.0'
}
2 changes: 1 addition & 1 deletion client-domain/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
compile 'com.google.dagger:dagger:2.11'
provided 'com.google.dagger:dagger-compiler:2.11'

compile 'io.reactivex.rxjava2:rxjava:2.1.1'
compile 'io.reactivex.rxjava2:rxjava:2.1.2'
compile 'com.squareup.okhttp3:okhttp:3.8.1'
compile 'com.squareup.okio:okio:1.13.0'

Expand Down
36 changes: 18 additions & 18 deletions client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,26 @@ dependencies {
compile project(':client-domain')
compile project(':client-data')

compile 'com.android.support:appcompat-v7:25.4.0'
compile 'com.android.support:design:25.4.0'
compile 'com.android.support:cardview-v7:25.4.0'
compile 'com.android.support:customtabs:25.4.0'
compile 'com.android.support:support-compat:25.4.0'
compile 'com.android.support:animated-vector-drawable:25.4.0'
compile 'com.android.support:appcompat-v7:26.0.0'
compile 'com.android.support:design:26.0.0'
compile 'com.android.support:cardview-v7:26.0.0'
compile 'com.android.support:customtabs:26.0.0'
compile 'com.android.support:support-compat:26.0.0'
compile 'com.android.support:animated-vector-drawable:26.0.0'

compile 'com.google.firebase:firebase-core:11.0.2'
compile 'com.google.firebase:firebase-crash:11.0.2'
compile 'com.google.firebase:firebase-config:11.0.2'
compile 'com.google.firebase:firebase-perf:11.0.2'
compile 'com.google.firebase:firebase-messaging:11.0.2'
compile 'com.google.firebase:firebase-database:11.0.2'
compile 'com.google.firebase:firebase-core:11.0.4'
compile 'com.google.firebase:firebase-crash:11.0.4'
compile 'com.google.firebase:firebase-config:11.0.4'
compile 'com.google.firebase:firebase-perf:11.0.4'
compile 'com.google.firebase:firebase-messaging:11.0.4'
compile 'com.google.firebase:firebase-database:11.0.4'

compile "android.arch.lifecycle:runtime:1.0.0-alpha3"
compile "android.arch.lifecycle:runtime:1.0.0-alpha8"

compile 'com.facebook.fresco:fresco:1.3.0'
compile 'com.facebook.fresco:fresco:1.4.0'

compile 'com.jakewharton:butterknife:8.6.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
compile 'com.jakewharton:butterknife:8.7.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'

compile 'com.airbnb.android:epoxy:2.2.0'

Expand All @@ -78,12 +78,12 @@ dependencies {
testCompile 'com.google.code.gson:gson:2.8.1'

testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.4-rc3'
testCompile 'org.robolectric:robolectric:3.4'
testCompile 'javax.inject:javax.inject:1'
testCompile 'org.mockito:mockito-core:2.8.47'
testCompile 'org.assertj:assertj-core:3.8.0'
testCompile 'org.threeten:threetenbp:1.3.3' // to fix failures with three ten db
testCompile 'com.android.support:support-annotations:25.4.0' //to fix dependency conflicts
testCompile 'com.android.support:support-annotations:26.0.0' //to fix dependency conflicts

androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test:runner:0.5'
Expand Down

0 comments on commit 3cd9acb

Please sign in to comment.