Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 16615ba

Browse files
author
ErikJhordan
committedMay 10, 2018
Upgrade gradle & tools
1 parent e826072 commit 16615ba

File tree

3 files changed

+24
-32
lines changed

3 files changed

+24
-32
lines changed
 

‎app/build.gradle

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
55

66
android {
77
compileSdkVersion 27
8-
buildToolsVersion "27.0.2"
8+
buildToolsVersion "27.0.3"
99
defaultConfig {
1010
applicationId "erikjhordanrey.android_kotlin_devises"
1111
minSdkVersion 15
@@ -23,43 +23,39 @@ android {
2323
}
2424
}
2525

26-
/**
27-
* if you will mix Java and Kotlin files in the same project is a good practice create a kotlin directory
28-
* but I prefer created the kotlin package although I will not mix them
29-
**/
3026
sourceSets {
3127
main.java.srcDirs += 'src/main/kotlin'
3228
}
3329
}
3430

3531
dependencies {
3632

37-
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
33+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
3834

3935
String archVersion = '1.0.0'
40-
compile "android.arch.lifecycle:runtime:$archVersion"
41-
compile "android.arch.lifecycle:extensions:$archVersion"
36+
implementation "android.arch.lifecycle:runtime:1.1.1"
37+
implementation "android.arch.lifecycle:extensions:1.1.1"
4238
kapt "android.arch.lifecycle:compiler:$archVersion"
43-
compile "android.arch.persistence.room:runtime:$archVersion"
39+
implementation "android.arch.persistence.room:runtime:$archVersion"
4440
kapt "android.arch.persistence.room:compiler:$archVersion"
45-
compile "android.arch.persistence.room:rxjava2:$archVersion"
41+
implementation "android.arch.persistence.room:rxjava2:$archVersion"
4642

47-
compile 'com.squareup.retrofit2:retrofit:2.3.0'
48-
compile "com.squareup.retrofit2:converter-gson:2.3.0"
49-
compile 'com.squareup.okhttp3:okhttp:3.9.0'
50-
compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
51-
compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
43+
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
44+
implementation "com.squareup.retrofit2:converter-gson:2.3.0"
45+
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
46+
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
47+
implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
5248

53-
String supportVersion = '27.0.2'
54-
compile "com.android.support:appcompat-v7:$supportVersion"
55-
compile "com.android.support:design:$supportVersion"
56-
compile "com.android.support:support-vector-drawable:$supportVersion"
57-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
49+
String supportVersion = '27.1.1'
50+
implementation "com.android.support:appcompat-v7:$supportVersion"
51+
implementation "com.android.support:design:$supportVersion"
52+
implementation "com.android.support:support-vector-drawable:$supportVersion"
53+
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
5854

5955
String daggerVersion = '2.13'
60-
compile "com.google.dagger:dagger:$daggerVersion"
56+
implementation "com.google.dagger:dagger:$daggerVersion"
6157
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
6258

63-
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
64-
compile 'io.reactivex.rxjava2:rxjava:2.1.5'
59+
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
60+
implementation 'io.reactivex.rxjava2:rxjava:2.1.10'
6561
}

‎build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
4-
ext.kotlin_version = '1.1.51'
2+
ext.kotlin_version = '1.2.30'
53
repositories {
64
jcenter()
75
maven { url 'https://maven.google.com' }
6+
google()
87
}
98
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
9+
classpath 'com.android.tools.build:gradle:3.1.2'
1110
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12-
13-
// NOTE: Do not place your application dependencies here; they belong
14-
// in the individual module build.gradle files
1511
}
1612
}
1713

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Oct 26 07:40:53 CDT 2017
1+
#Thu May 10 01:43:28 CDT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 commit comments

Comments
 (0)
Please sign in to comment.