Explorar el Código

Updated kotlin, gradle and libraries

Vadik Sirekanyan hace 6 años
padre
commit
5832affaca

+ 12 - 10
app/build.gradle.kts

@@ -33,7 +33,7 @@ android {
 
 dependencies {
     // kotlin standard library
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61")
 
     // androidx libraries
     implementation("androidx.appcompat:appcompat:1.1.0")
@@ -41,19 +41,21 @@ dependencies {
     implementation("androidx.browser:browser:1.0.0")
 
     // rxjava
-    implementation("io.reactivex.rxjava2:rxjava:2.2.5")
-    implementation("io.reactivex.rxjava2:rxkotlin:2.3.0")
-    implementation("io.reactivex.rxjava2:rxandroid:2.1.0")
+    implementation("io.reactivex.rxjava2:rxjava:2.2.15")
+    implementation("io.reactivex.rxjava2:rxkotlin:2.4.0")
+    implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
 
-    // retrofit & okhttp
-    implementation("com.squareup.retrofit2:retrofit:2.6.1")
-    implementation("com.squareup.retrofit2:adapter-rxjava2:2.5.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.6.1")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.2.0")
+    // retrofit
+    implementation("com.squareup.retrofit2:retrofit:2.6.2")
+    implementation("com.squareup.retrofit2:adapter-rxjava2:2.6.2")
+    implementation("com.squareup.retrofit2:converter-gson:2.6.2")
+
+    // okhttp
+    implementation("com.squareup.okhttp3:logging-interceptor:3.12.6") // use 3.12.x if minSdkVersion < 21
 
     // etc
     implementation("com.google.android.material:material:1.0.0")
-    implementation("com.github.bumptech.glide:glide:4.8.0")
+    implementation("com.github.bumptech.glide:glide:4.10.0")
     implementation(files("libs/ulogin-sdk-v1.1.aar"))
 }
 

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/network/AuthInterceptor.kt

@@ -13,9 +13,9 @@ class AuthInterceptor(private val storage: TokenStorage) : Interceptor {
     override fun intercept(chain: Chain): Response {
         val request = chain.request()
         val response = chain.proceed(request)
-        if (response.code == UNAUTHORIZED_HTTP_CODE) {
+        if (response.code() == UNAUTHORIZED_HTTP_CODE) {
             storage.accessToken?.let { accessToken ->
-                val urlWithAccessToken = request.url.newBuilder()
+                val urlWithAccessToken = request.url().newBuilder()
                     .addQueryParameter(ACCESS_TOKEN_PARAMETER_NAME, accessToken)
                     .build()
                 return chain.proceed(

+ 2 - 2
build.gradle.kts

@@ -4,8 +4,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
+        classpath("com.android.tools.build:gradle:3.5.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
     }
 }
 

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip