Skip to content

Commit aaf1a9e

Browse files
committed
Upgrade stuffs
1 parent 4195998 commit aaf1a9e

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

app/build.gradle

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ apply plugin: "kotlin-android-extensions"
44
apply plugin: "kotlin-kapt"
55

66
android {
7-
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
8-
7+
compileSdkVersion 28
98
defaultConfig {
109
applicationId "cn.nekocode.gank"
1110
minSdkVersion 16
12-
targetSdkVersion 27
11+
targetSdkVersion 28
1312
versionCode 1
1413
versionName "1.0"
1514

@@ -35,17 +34,17 @@ dependencies {
3534
implementation project(":backend")
3635

3736
// Kotlin
38-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${KOTLIN_VERSION}"
37+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11"
3938

4039
// Android support libraries
41-
implementation "com.android.support:appcompat-v7:${SUPPORT_LIBS_VERSION}"
42-
implementation "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"
43-
implementation "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}"
44-
implementation "com.android.support.constraint:constraint-layout:1.1.2"
40+
implementation "com.android.support:appcompat-v7:28.0.0"
41+
implementation "com.android.support:recyclerview-v7:28.0.0"
42+
implementation "com.android.support:support-annotations:28.0.0"
43+
implementation "com.android.support.constraint:constraint-layout:1.1.3"
4544

4645
// ReactiveX
47-
implementation "io.reactivex.rxjava2:rxjava:2.1.8"
48-
implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
46+
implementation "io.reactivex.rxjava2:rxjava:2.2.2"
47+
implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
4948
def AUTO_DISPOSE_VERSION = "0.8.0"
5049
implementation "com.uber.autodispose:autodispose:${AUTO_DISPOSE_VERSION}"
5150
implementation "com.uber.autodispose:autodispose-android:${AUTO_DISPOSE_VERSION}"

backend/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ apply plugin: "com.android.library"
22
apply plugin: "kotlin-android"
33

44
android {
5-
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
6-
5+
compileSdkVersion 28
76
defaultConfig {
87
minSdkVersion 16
9-
targetSdkVersion 27
8+
targetSdkVersion 28
109
consumerProguardFiles "proguard-rules.pro"
1110
}
1211
}
@@ -16,17 +15,17 @@ dependencies {
1615
testImplementation "junit:junit:4.12"
1716

1817
// Kotlin
19-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${KOTLIN_VERSION}"
18+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11"
2019

2120
// Network
22-
api "com.squareup.okhttp3:okhttp:3.10.0"
21+
api "com.squareup.okhttp3:okhttp:3.11.0"
2322
api "com.google.code.gson:gson:2.8.4"
2423
def RETROFIT_VERSION = "2.4.0"
2524
implementation "com.squareup.retrofit2:retrofit:${RETROFIT_VERSION}"
2625
implementation "com.squareup.retrofit2:converter-gson:${RETROFIT_VERSION}"
2726
implementation "com.squareup.retrofit2:adapter-rxjava2:${RETROFIT_VERSION}"
2827

2928
// ReactiveX
30-
api "io.reactivex.rxjava2:rxjava:2.1.8"
31-
api "io.reactivex.rxjava2:rxandroid:2.0.1"
29+
api "io.reactivex.rxjava2:rxjava:2.2.2"
30+
api "io.reactivex.rxjava2:rxandroid:2.1.0"
3231
}

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
google()
55
}
66
dependencies {
7-
classpath "com.android.tools.build:gradle:3.1.3"
8-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN_VERSION}"
7+
classpath "com.android.tools.build:gradle:3.3.0"
8+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
99
}
1010
}
1111

gradle.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
KOTLIN_VERSION=1.2.51
2-
COMPILE_SDK_VERSION=27
3-
SUPPORT_LIBS_VERSION=27.1.1
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed May 16 21:52:15 CST 2018
1+
#Sun Jan 27 11:04:57 CST 2019
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.10.1-all.zip

0 commit comments

Comments
 (0)