feat: Upgrade Depend Version

biezhihua · Mar 7, 2019 · 2c14c45 · 2c14c45
1 parent 2868647
commit 2c14c45
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 95 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -50,9 +50,9 @@ android {
         abortOnError false
     }
 
-//    lintOptions {
-//        lintConfig rootProject.file('lint.xml')
-//    }
+    lintOptions {
+        lintConfig rootProject.file('lint.xml')
+    }
 
     dataBinding {
         enabled = true
@@ -133,9 +133,9 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
 
     //
-    implementation 'com.google.dagger:dagger:2.15'
-    implementation 'com.google.dagger:dagger-android:2.15'
-    implementation 'com.google.dagger:dagger-android-support:2.15'
+    implementation 'com.google.dagger:dagger:2.17'
+    implementation 'com.google.dagger:dagger-android:2.17'
+    implementation 'com.google.dagger:dagger-android-support:2.17'
 
     implementation 'com.github.bumptech.glide:glide:4.9.0'
 
@@ -151,7 +151,6 @@ dependencies {
     implementation "android.arch.navigation:navigation-ui:1.0.0-rc02" // use -ktx for Kotlin
 
     // java
-    testImplementation 'com.android.tools.lint:lint-api:26.3.1'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.22.0'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'

diff --git a/app/src/main/java/com/bzh/dytt/base/BasicApp.kt b/app/src/main/java/com/bzh/dytt/base/BasicApp.kt
@@ -32,6 +32,7 @@ class BasicApp : Application(), HasActivityInjector {
         Log.d(TAG, "onCreate() called ${getSignature(this)}")
     }
 
+    @Suppress("DEPRECATION")
     @SuppressLint("WrongConstant", "PackageManagerGetSignatures")
     private fun getSignature(context: Context): String = if (Build.VERSION.SDK_INT >= 28) {
         val packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNING_CERTIFICATES)

diff --git a/app/src/main/java/com/bzh/dytt/di/AppComponent.kt b/app/src/main/java/com/bzh/dytt/di/AppComponent.kt
@@ -5,6 +5,7 @@ import com.bzh.dytt.base.BasicApp
 import dagger.BindsInstance
 import dagger.Component
 import dagger.android.AndroidInjectionModule
+import dagger.android.support.AndroidSupportInjectionModule
 import javax.inject.Singleton
 
 
@@ -16,7 +17,7 @@ import javax.inject.Singleton
  * http://a.codekk.com/detail/Android/%E6%89%94%E7%89%A9%E7%BA%BF/Dagger%20%E6%BA%90%E7%A0%81%E8%A7%A3%E6%9E%90
  */
 @Singleton
-@Component(modules = [AndroidInjectionModule::class, MainActivityModule::class, AppModule::class])
+@Component(modules = [AndroidSupportInjectionModule::class, MainActivityModule::class, AppModule::class])
 interface AppComponent {
 
     fun inject(basicApp: BasicApp)

diff --git a/app/src/main/java/com/bzh/dytt/repository/DelayRunnableQueue.kt b/app/src/main/java/com/bzh/dytt/repository/DelayRunnableQueue.kt
@@ -21,8 +21,8 @@ class DelayObject<F, E : Runnable>(val flag: F, val data: E? = null) : Delayed {
         return unit.convert(diff, TimeUnit.MILLISECONDS)
     }
 
-    override fun compareTo(o: Delayed): Int {
-        return saturatedCast(this.startTimeMillis - (o as DelayObject<*, *>).startTimeMillis)
+    override fun compareTo(other: Delayed): Int {
+        return saturatedCast(this.startTimeMillis - (other as DelayObject<*, *>).startTimeMillis)
     }
 
     override fun equals(other: Any?): Boolean {

diff --git a/lintrules/.gitignore b/lintrules/.gitignore
diff --git a/lintrules/build.gradle b/lintrules/build.gradle
diff --git a/lintrules/src/main/java/com/bzh/dytt/lint/LogDetector.java b/lintrules/src/main/java/com/bzh/dytt/lint/LogDetector.java
diff --git a/lintrules/src/main/java/com/bzh/dytt/lint/MyIssueRegistry.java b/lintrules/src/main/java/com/bzh/dytt/lint/MyIssueRegistry.java