Skip to content

Commit

Permalink
update gradle and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
DZRjbvincey committed May 30, 2018
1 parent 4a2efb3 commit ee3efb8
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 22 deletions.
28 changes: 14 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "com.android.support:appcompat-v7:$rootProject.androidSupport"
compile "com.android.support:recyclerview-v7:$rootProject.androidSupport"
compile "com.android.support:cardview-v7:$rootProject.androidSupport"
compile "com.android.support:design:$rootProject.androidSupport"
testCompile 'junit:junit:4.12'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.google.android.instantapps:instantapps:1.0.0'
implementation "com.android.support:appcompat-v7:$rootProject.androidSupport"
implementation "com.android.support:recyclerview-v7:$rootProject.androidSupport"
implementation "com.android.support:cardview-v7:$rootProject.androidSupport"
implementation "com.android.support:design:$rootProject.androidSupport"
testImplementation 'junit:junit:4.12'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
implementation 'com.google.android.instantapps:instantapps:1.1.0'

compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'io.reactivex.rxjava2:rxjava:2.1.0'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.1.6'

compile 'com.google.code.gson:gson:2.8.1'
implementation 'com.google.code.gson:gson:2.8.1'

compile 'commons-io:commons-io:2.5'
implementation 'commons-io:commons-io:2.5'

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

}
13 changes: 7 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ buildscript {
repositories {
maven { url 'https://maven.google.com' }
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
classpath 'com.android.tools.build:gradle:3.1.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -22,11 +23,11 @@ allprojects {
}

ext {
minSdkVersion = 23
targetSdkVersion = 26
compileSdkVersion = 25
buildToolsVersion = '25.0.3'
androidSupport = '25.3.1'
minSdkVersion = 21
targetSdkVersion = 27
compileSdkVersion = 27
buildToolsVersion = '27.0.3'
androidSupport = '27.1.1'

}

Expand Down
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 @@
#Fri Jun 09 14:36:39 CEST 2017
#Tue May 29 13:46:56 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 comments on commit ee3efb8

Please sign in to comment.