Skip to content
This repository was archived by the owner on Jun 28, 2019. It is now read-only.

Commit d9b2896

Browse files
committed
Kotlin 1.3, ライブラリ更新
1 parent 9fb4a44 commit d9b2896

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

build.gradle

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.61'
4+
ext.kotlin_version = '1.3.0'
55
ext.versions = [
66
'compileSdk': 27,
77
'minSdk': 16,
88
'targetSdk': 27,
99
'supportLibrary': '27.1.1',
10-
'constraintLayout': '1.1.3',
11-
'gson': '2.8.5',
12-
'okhttp': '3.10.0',
13-
'retrofit' : '2.4.0',
14-
'rx2java' : '2.2.0',
15-
'rx2android' : '2.1.0'
10+
'constraintLayout': '1.1.3'
1611
]
1712
repositories {
1813
google()
1914
jcenter()
2015
}
2116
dependencies {
22-
classpath 'com.android.tools.build:gradle:3.1.4'
17+
classpath 'com.android.tools.build:gradle:3.2.1'
2318
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2419
}
2520
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Jul 01 16:03:41 JST 2018
1+
#Tue Oct 30 15:28:34 JST 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.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

studyplus-android-sdk2/build.gradle

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,22 @@ android {
6565

6666
dependencies {
6767
implementation fileTree(dir: 'libs', include: ['*.jar'])
68+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
6869

69-
implementation "com.google.code.gson:gson:${versions.gson}"
70+
implementation 'com.google.code.gson:gson:2.8.5'
7071

71-
implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
72-
implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"
72+
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
7373

74-
implementation "com.squareup.retrofit2:retrofit:${versions.retrofit}"
75-
implementation "com.squareup.retrofit2:adapter-rxjava2:${versions.retrofit}"
76-
implementation "com.squareup.retrofit2:converter-gson:${versions.retrofit}"
77-
testImplementation "com.squareup.retrofit2:retrofit-mock:${versions.retrofit}"
74+
def retrofit = "2.4.0"
75+
implementation "com.squareup.retrofit2:retrofit:$retrofit"
76+
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
77+
implementation "com.squareup.retrofit2:converter-gson:$retrofit"
78+
testImplementation "com.squareup.retrofit2:retrofit-mock:$retrofit"
7879

79-
implementation "io.reactivex.rxjava2:rxjava:${versions.rx2java}"
80-
implementation "io.reactivex.rxjava2:rxandroid:${versions.rx2android}"
80+
implementation "io.reactivex.rxjava2:rxjava:2.2.2"
81+
implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
8182

8283
testImplementation 'junit:junit:4.12'
83-
84-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
8584
}
8685

8786
apply from: 'build.publish.gradle'

0 commit comments

Comments
 (0)