as-gradle插件更新4.0

app/build.gradle

@@ -25,10 +25,9 @@ android {
                              "room.expandProjection":"true"]
             }
         }
-    }
-
-    dataBinding {
-        enabled true
+        buildFeatures{
+            dataBinding true
+        }
     }
 
     aaptOptions {
@@ -119,11 +118,11 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'androidx.paging:paging-runtime:2.1.2'
@@ -132,8 +131,8 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0-alpha05'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0-alpha05'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0-beta01'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0-beta01'
     implementation 'androidx.room:room-runtime:2.2.5'
     implementation 'androidx.room:room-ktx:2.2.5'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
@@ -141,13 +140,10 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
 
     implementation 'com.google.code.gson:gson:2.8.6'
 
-    implementation 'com.tencent.bugly:nativecrashreport:3.7.1'
-    implementation 'com.tencent.tinker:tinker-android-lib:1.9.14.5'
-    implementation 'com.tencent.bugly:crashreport_upgrade:1.4.5'
+    implementation 'com.tencent.bugly:crashreport:3.1.9'
 
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation 'com.github.SheHuan:NiceImageView:1.0.5'

app/src/main/java/com/bearya/kids/App.kt

@@ -2,8 +2,9 @@ package com.bearya.kids
 
 import android.app.Application
 import androidx.databinding.DataBindingUtil
-import com.orhanobut.logger.Logger
+
 import library.BindingComponent
+import library.CrashComponent
 import library.LoggerComponent
 
 class App : Application() {
@@ -12,7 +13,7 @@ class App : Application() {
         super.onCreate()
 
         LoggerComponent.init()
-//        BuglyComponent.init(applicationContext)
+        CrashComponent.init(applicationContext)
         AppDatabase.init(applicationContext)
 
         DataBindingUtil.setDefaultComponent(BindingComponent)

app/src/main/java/library/BuglyComponent.kt

@@ -1,18 +0,0 @@
-package library
-
-import android.content.Context
-import android.os.Build
-import com.bearya.kids.BuildConfig
-import com.tencent.bugly.Bugly
-import com.tencent.bugly.BuglyStrategy
-
-object BuglyComponent {
-
-    fun init(context: Context) {
-        // 开发设备设置
-        Bugly.setIsDevelopmentDevice(context, BuildConfig.DEBUG)
-        Bugly.init(context, BuildConfig.BuglyAppKey, BuildConfig.DEBUG, BuglyStrategy().apply { appVersion = BuildConfig.VERSION_NAME })
-        Bugly.setUserId(context, Build.SERIAL)
-    }
-
-}

app/src/main/java/library/CrashComponent.kt

@@ -0,0 +1,15 @@
+package library
+
+import android.content.Context
+import com.bearya.kids.BuildConfig
+import com.tencent.bugly.crashreport.CrashReport
+
+object CrashComponent {
+
+    fun init(context: Context) {
+        // 开发设备设置
+        CrashReport.initCrashReport(context, BuildConfig.BuglyAppKey, BuildConfig.DEBUG, CrashReport.UserStrategy(context).apply { appVersion = BuildConfig.VERSION_NAME })
+        CrashReport.setIsDevelopmentDevice(context, BuildConfig.DEBUG)
+    }
+
+}

app/version.properties

@@ -1,3 +1,3 @@
-#Mon May 11 11:30:42 CST 2020
+#Tue Jun 02 16:38:47 CST 2020
 VERSION_NAME=1.1.6
-VERSION_CODE=234
+VERSION_CODE=248

build.gradle

@@ -5,13 +5,11 @@ buildscript {
     repositories {
         google()
         jcenter()
-        
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0-alpha05'
-        classpath 'com.tencent.bugly:tinker-support:1.2.1'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0-beta01'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Apr 21 09:37:31 CST 2020
+#Tue Jun 02 16:37:50 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip