瀏覽代碼

Updated gradle, android plugin, kotlin and libraries

Vadik Sirekanyan 7 年之前
父節點
當前提交
4facf36d77

+ 7 - 7
app/build.gradle.kts

@@ -38,7 +38,7 @@ android {
 
 dependencies {
     // kotlin standard library
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11")
 
     // support libraries
     implementation("com.android.support:appcompat-v7:28.0.0")
@@ -47,16 +47,16 @@ dependencies {
     implementation("com.android.support.constraint:constraint-layout:1.1.3")
 
     // rxjava
-    implementation("io.reactivex.rxjava2:rxjava:2.2.2")
+    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("com.tbruyelle.rxpermissions2:rxpermissions:0.9.4@aar")
+    implementation("com.github.tbruyelle:rxpermissions:0.10.2")
 
     // retrofit & okhttp
-    implementation("com.squareup.retrofit2:retrofit:2.4.0")
-    implementation("com.squareup.retrofit2:adapter-rxjava2:2.4.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.4.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:3.11.0")
+    implementation("com.squareup.retrofit2:retrofit:2.5.0")
+    implementation("com.squareup.retrofit2:adapter-rxjava2:2.5.0")
+    implementation("com.squareup.retrofit2:converter-gson:2.5.0")
+    implementation("com.squareup.okhttp3:logging-interceptor:3.12.1")
 
     // etc
     implementation("com.github.bumptech.glide:glide:4.8.0")

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/common/android/Permissions.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.common.android
 
 import android.Manifest.permission.READ_PHONE_STATE
-import android.app.Activity
+import android.support.v7.app.AppCompatActivity
 import com.tbruyelle.rxpermissions2.Permission
 import com.tbruyelle.rxpermissions2.RxPermissions
 import io.reactivex.Single
@@ -12,7 +12,7 @@ interface Permissions {
 
 }
 
-class PermissionsImpl(private val activity: Activity) : Permissions {
+class PermissionsImpl(private val activity: AppCompatActivity) : Permissions {
 
     override fun requestReadPhoneState(): Single<Permission> =
         RxPermissions(activity).requestEach(READ_PHONE_STATE).firstOrError()

+ 2 - 1
app/src/main/java/com/sirekanyan/knigopis/dependency/activity.kt

@@ -1,6 +1,7 @@
 package com.sirekanyan.knigopis.dependency
 
 import android.app.Activity
+import android.support.v7.app.AppCompatActivity
 import com.sirekanyan.knigopis.common.android.Permissions
 import com.sirekanyan.knigopis.common.android.PermissionsImpl
 import com.sirekanyan.knigopis.common.android.dialog.BottomSheetDialogFactory
@@ -9,5 +10,5 @@ import com.sirekanyan.knigopis.common.android.dialog.DialogFactory
 fun Activity.provideDialogs(): DialogFactory =
     BottomSheetDialogFactory(this)
 
-fun Activity.providePermissions(): Permissions =
+fun AppCompatActivity.providePermissions(): Permissions =
     PermissionsImpl(this)

+ 2 - 1
app/src/main/res/layout/about.xml

@@ -9,7 +9,8 @@
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:ignore="UnusedAttribute">
 
     <ImageView
         android:layout_width="64dp"

+ 1 - 1
app/src/main/res/layout/user.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="56dp"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:background="?android:attr/selectableItemBackground"
     android:paddingEnd="16dp"
     android:paddingStart="16dp">
 

+ 8 - 2
build.gradle.kts

@@ -4,8 +4,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.2.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.10")
+        classpath("com.android.tools.build:gradle:3.3.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11")
     }
 }
 
@@ -13,6 +13,12 @@ allprojects {
     repositories {
         jcenter()
         google()
+        maven {
+            url = uri("https://jitpack.io")
+            content {
+                includeGroup("com.github.tbruyelle")
+            }
+        }
     }
 }
 

+ 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-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip