Skip to content

Commit

Permalink
Update build tools and dependencies versions / revisions.
Browse files Browse the repository at this point in the history
  • Loading branch information
rengwuxian committed Sep 20, 2017
1 parent 1d768b4 commit cdbcb07
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 19 deletions.
35 changes: 18 additions & 17 deletions app/build.gradle
@@ -1,13 +1,14 @@
//noinspection GradleCompatible
apply plugin: 'com.android.application' apply plugin: 'com.android.application'


android { android {
compileSdkVersion 24 compileSdkVersion 26
buildToolsVersion "23.0.3" buildToolsVersion "26.0.1"


defaultConfig { defaultConfig {
applicationId "com.rengwuxian.rxjavasamples" applicationId "com.rengwuxian.rxjavasamples"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 24 targetSdkVersion 26
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
Expand All @@ -22,19 +23,19 @@ android {
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:support-v4:24.2.1' compile 'com.android.support:support-v4:26.1.0'
compile 'com.android.support:support-v13:24.2.1' compile 'com.android.support:support-v13:26.1.0'
compile 'com.android.support:design:24.2.1' compile 'com.android.support:design:26.1.0'
compile 'com.android.support:cardview-v7:24.2.1' compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.squareup.okhttp3:okhttp:3.2.0' compile 'com.squareup.okhttp3:okhttp:3.2.0'
compile 'com.squareup.retrofit2:retrofit:2.0.0' compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.0.0' compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.0' compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.github.bumptech.glide:glide:4.1.1'
compile 'com.jakewharton:butterknife:7.0.1' annotationProcessor 'com.github.bumptech.glide:compiler:4.1.1'
compile 'io.reactivex:rxjava:1.1.0' compile 'com.jakewharton:butterknife:8.4.0'
compile 'io.reactivex:rxandroid:1.1.0' compile 'io.reactivex.rxjava2:rxjava:2.0.7'
compile 'com.jakewharton.rxbinding:rxbinding:0.4.0' compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'io.reactivex:rxjava:1.0.10' compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
} }
1 change: 1 addition & 0 deletions build.gradle
Expand Up @@ -15,6 +15,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
maven { url 'https://maven.google.com' }
} }
} }


Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Sat Oct 08 14:25:05 CST 2016 #Wed Sep 20 11:16:00 CST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 comments on commit cdbcb07

Please sign in to comment.