diff --git a/build.gradle b/build.gradle index 835e8b8..f37adf7 100644 --- a/build.gradle +++ b/build.gradle @@ -17,13 +17,13 @@ buildscript { 'metro_compiler' : 'com.github.caoyanglee.Metro:compiler:0.3.1'//简易路由-注解处理器 ] ] - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.4.20' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } diff --git a/lib/build.gradle b/lib/build.gradle index b362776..cfc82b5 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -39,26 +39,22 @@ dependencies { //google core compile 'androidx.core:core-ktx:1.3.2' compile 'androidx.appcompat:appcompat:1.2.0' - compile 'androidx.constraintlayout:constraintlayout:2.0.2' + compile 'androidx.constraintlayout:constraintlayout:2.0.4' //google extra - compile 'com.google.android.material:material:1.2.1' compile "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" compile 'androidx.recyclerview:recyclerview:1.1.0' compile 'androidx.cardview:cardview:1.0.0' + compile 'com.google.android.material:material:1.2.1' // ViewModel compile "androidx.lifecycle:lifecycle-extensions:2.2.0"//2.2.0之后,不再发布 lifecycle-extensions 工件 //kt-coroutines compile 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9' compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9' //json - compile 'com.google.code.gson:gson:2.8.5' + compile 'com.google.code.gson:gson:2.8.6' //event bus - compile 'org.greenrobot:eventbus:3.1.1' - //RxJava RxAndroid -// compile 'io.reactivex.rxjava2:rxjava:2.1.16' -// compile 'io.reactivex.rxjava2:rxandroid:2.0.2' + compile 'org.greenrobot:eventbus:3.2.0' //permission - //compile 'com.github.tbruyelle:rxpermissions:0.10.2' compile 'com.afollestad.assent:core:3.0.0-RC4' //glide compile 'com.github.bumptech.glide:glide:4.11.0' diff --git a/lib/consumer-rules.pro b/lib/consumer-rules.pro index 13c26e0..ec22d6d 100644 --- a/lib/consumer-rules.pro +++ b/lib/consumer-rules.pro @@ -1,4 +1,4 @@ -# Glide +# >>> Glide -keep public class * implements com.bumptech.glide.module.GlideModule -keep class * extends com.bumptech.glide.module.AppGlideModule { (...); @@ -9,4 +9,19 @@ } -keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder { *** rewind(); -} \ No newline at end of file +} +# <<< Glide + +# >>> EventBus +-keepattributes *Annotation* +-keepclassmembers class * { + @org.greenrobot.eventbus.Subscribe ; +} +-keep enum org.greenrobot.eventbus.ThreadMode { *; } + +# Only required if you use AsyncExecutor +-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent { + (java.lang.Throwable); +} + +# <<< EventBus \ No newline at end of file