diff --git a/CHANGELOG.md b/CHANGELOG.md index 256257b13f3f6d183a1da0eda4d04dab418428e4..70b6a5bc948030d4da6a17336c0e1a657ebc69e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ -* `19/07/15` [upd] Bus plugin for use BusUtils. Publish bus plugin v2.0. -* `19/07/15` [add] Api plugin for use ApiUtils. Publish api plugin v1.0. +* `19/07/15` [add] Publish v1.25.0. +* `19/07/14` [upd] Bus plugin for use BusUtils. Publish bus plugin v2.0. +* `19/07/13` [add] Api plugin for use ApiUtils. Publish api plugin v1.0. * `19/07/09` [upd] The frame of project. * `19/07/06` [upd] BusUtils which behave same as EventBus. * `19/07/03` [add] ApiUtils which decoupling modules. -* `19/06/30` [add] LanguageUtils support activity's class name. Publish v1.24.7. +* `19/06/30` [add] LanguageUtils support activity's class name. Publish v1.25.0. * `19/06/29` [add] ClickUtils#OnMultiClickListener, and remove dangerous function. Publish v1.24.6. * `19/06/28` [add] LanguageUtils. Publish v1.24.5. * `19/06/20` [fix] BusUtils' permission. Publish v1.24.4. diff --git a/README-CN.md b/README-CN.md index 426d0d6332dd965c67345066e2bfea42775472b9..d1f5ce60250956778b276a6df51cb7a81b0bf4ba 100644 --- a/README-CN.md +++ b/README-CN.md @@ -41,7 +41,7 @@ [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png -[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.7-brightgreen.svg +[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.0-brightgreen.svg [auc]: https://github.com/Blankj/AndroidUtilCode [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg diff --git a/README.md b/README.md index 9d89c6f095bf5beed78f1d70e711b9055bc85d6d..5268261faeadfc034b7989de47e2ff530422841c 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png -[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.7-brightgreen.svg +[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.0-brightgreen.svg [auc]: https://github.com/Blankj/AndroidUtilCode [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg diff --git a/buildLib.gradle b/buildLib.gradle index 989c170df856834f89c9ca776a87252904ef0bb8..f6342eea025fd608117772b8aef769bd9425e031 100644 --- a/buildLib.gradle +++ b/buildLib.gradle @@ -17,6 +17,7 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + consumerProguardFiles 'proguard-rules.pro' } } diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy index f46695fc41f7b38176f87c41740e30114f6c3394..e60ed7b621a840e5d7d06633ee52f4a73ad6f198 100644 --- a/buildSrc/src/main/groovy/Config.groovy +++ b/buildSrc/src/main/groovy/Config.groovy @@ -99,7 +99,10 @@ class Config { glide : new DepConfig("com.github.bumptech.glide:glide:4.7.1"), retrofit : new DepConfig("com.squareup.retrofit2:retrofit:2.4.0"), commons_io : new DepConfig("commons-io:commons-io:2.6"), - eventbus : new DepConfig("org.greenrobot:eventbus:3.1.1"), + eventbus : [ + lib : new DepConfig("org.greenrobot:eventbus:3.1.1"), + processor: new DepConfig("org.greenrobot:eventbus-annotation-processor:3.0.1") + ], test : [ junit : new DepConfig("junit:junit:4.12"), diff --git a/feature/launcher/app/build.gradle b/feature/launcher/app/build.gradle index b83ea67a3619dfad6517fccd6dc0a87515d7f801..9320e2df30a5342da009f48e6a06de6efa5b9e6d 100644 --- a/feature/launcher/app/build.gradle +++ b/feature/launcher/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'kotlin-kapt' dependencies { - kapt 'org.greenrobot:eventbus-annotation-processor:3.0.1' + kapt Config.depConfig.eventbus.processor.dep } \ No newline at end of file diff --git a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusActivity.kt b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusActivity.kt index cbd8cb162c1d735367c0d2bdc92e2e7330ec6bf4..077ecf43e80111e9aa9d5690d31fa2ac8c996744 100644 --- a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusActivity.kt +++ b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusActivity.kt @@ -3,6 +3,7 @@ package com.blankj.utilcode.pkg.feature.bus import android.content.Context import android.content.Intent import android.os.Bundle +import android.support.annotation.Keep import android.view.View import com.blankj.lib.common.CommonTitleActivity import com.blankj.utilcode.pkg.R @@ -112,6 +113,7 @@ class BusActivity : CommonTitleActivity() { BusUtils.unregister(this) } + @Keep interface Callback { fun call(): String } diff --git a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusCompareActivity.kt b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusCompareActivity.kt index 88a2b05e34e60c358470b066b701c0c74a5cbc5b..30b1e2c14c80a550196fc2136e424d1bfdc2e2f6 100644 --- a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusCompareActivity.kt +++ b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusCompareActivity.kt @@ -269,6 +269,7 @@ class BusCompareActivity : CommonTaskActivity() { private fun setBtnEnabled(enable: Boolean) { busCompareRegister10000TimesBtn.isEnabled = enable busComparePostTo1Subscriber1000000TimesBtn.isEnabled = enable + busComparePostTo100Subscribers100000TimesBtn.isEnabled = enable busCompareUnregister10000TimesBtn.isEnabled = enable } diff --git a/lib/base/build.gradle b/lib/base/build.gradle index 422ec2c5c8a477edbc78c808519cf48643969706..3b9c007384398006c9fe9b2151a434f1e36320a3 100644 --- a/lib/base/build.gradle +++ b/lib/base/build.gradle @@ -10,6 +10,6 @@ dependencies { api Config.depConfig.kotlin.dep api Config.depConfig.free_proguard.dep api Config.depConfig.swipe_panel.dep - api Config.depConfig.eventbus.dep + api Config.depConfig.eventbus.lib.dep compileOnly Config.depConfig.leakcanary.android_no_op.dep } \ No newline at end of file diff --git a/lib/utilcode/build.gradle b/lib/utilcode/build.gradle index 077960be6f8a44f66a6fce5d9bf0f736dc9615a3..12ac204250e0d3290a86b185801e720168b89bc7 100644 --- a/lib/utilcode/build.gradle +++ b/lib/utilcode/build.gradle @@ -20,5 +20,5 @@ dependencies { testImplementation Config.depConfig.test.junit.dep testImplementation Config.depConfig.test.robolectric.dep testImplementation Config.depConfig.support.appcompat_v7.dep - testImplementation Config.depConfig.eventbus.dep + testImplementation Config.depConfig.eventbus.lib.dep } \ No newline at end of file diff --git a/lib/utilcode/proguard-rules.pro b/lib/utilcode/proguard-rules.pro index 80e5150be1f1bf9fbeeceda9b827de978506c02c..a35f9c0d918ee8e70f06f1943bfe6d6c2a9e4d38 100644 --- a/lib/utilcode/proguard-rules.pro +++ b/lib/utilcode/proguard-rules.pro @@ -15,4 +15,10 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} --dontwarn com.blankj.utilcode.** \ No newline at end of file +-dontwarn com.blankj.utilcode.** + +-keepclassmembers class * { + @com.blankj.utilcode.util.BusUtils$Bus ; +} + +-keepattributes *Annotation* \ No newline at end of file