Skip to content

Commit 8761e09

Browse files
committed
see 07/16 log
1 parent 5b5d45c commit 8761e09

File tree

11 files changed

+24
-10
lines changed

11 files changed

+24
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
* `19/07/15` [upd] Bus plugin for use BusUtils. Publish bus plugin v2.0.
2-
* `19/07/15` [add] Api plugin for use ApiUtils. Publish api plugin v1.0.
1+
* `19/07/15` [add] Publish v1.25.0.
2+
* `19/07/14` [upd] Bus plugin for use BusUtils. Publish bus plugin v2.0.
3+
* `19/07/13` [add] Api plugin for use ApiUtils. Publish api plugin v1.0.
34
* `19/07/09` [upd] The frame of project.
45
* `19/07/06` [upd] BusUtils which behave same as EventBus.
56
* `19/07/03` [add] ApiUtils which decoupling modules.
6-
* `19/06/30` [add] LanguageUtils support activity's class name. Publish v1.24.7.
7+
* `19/06/30` [add] LanguageUtils support activity's class name. Publish v1.25.0.
78
* `19/06/29` [add] ClickUtils#OnMultiClickListener, and remove dangerous function. Publish v1.24.6.
89
* `19/06/28` [add] LanguageUtils. Publish v1.24.5.
910
* `19/06/20` [fix] BusUtils' permission. Publish v1.24.4.

README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.7-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.7-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

buildLib.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ android {
1717
release {
1818
minifyEnabled false
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
20+
consumerProguardFiles 'proguard-rules.pro'
2021
}
2122
}
2223

buildSrc/src/main/groovy/Config.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ class Config {
9999
glide : new DepConfig("com.github.bumptech.glide:glide:4.7.1"),
100100
retrofit : new DepConfig("com.squareup.retrofit2:retrofit:2.4.0"),
101101
commons_io : new DepConfig("commons-io:commons-io:2.6"),
102-
eventbus : new DepConfig("org.greenrobot:eventbus:3.1.1"),
102+
eventbus : [
103+
lib : new DepConfig("org.greenrobot:eventbus:3.1.1"),
104+
processor: new DepConfig("org.greenrobot:eventbus-annotation-processor:3.0.1")
105+
],
103106

104107
test : [
105108
junit : new DepConfig("junit:junit:4.12"),

feature/launcher/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'kotlin-kapt'
22

33
dependencies {
4-
kapt 'org.greenrobot:eventbus-annotation-processor:3.0.1'
4+
kapt Config.depConfig.eventbus.processor.dep
55
}

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusActivity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.blankj.utilcode.pkg.feature.bus
33
import android.content.Context
44
import android.content.Intent
55
import android.os.Bundle
6+
import android.support.annotation.Keep
67
import android.view.View
78
import com.blankj.lib.common.CommonTitleActivity
89
import com.blankj.utilcode.pkg.R
@@ -112,6 +113,7 @@ class BusActivity : CommonTitleActivity() {
112113
BusUtils.unregister(this)
113114
}
114115

116+
@Keep
115117
interface Callback {
116118
fun call(): String
117119
}

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusCompareActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ class BusCompareActivity : CommonTaskActivity<Unit>() {
269269
private fun setBtnEnabled(enable: Boolean) {
270270
busCompareRegister10000TimesBtn.isEnabled = enable
271271
busComparePostTo1Subscriber1000000TimesBtn.isEnabled = enable
272+
busComparePostTo100Subscribers100000TimesBtn.isEnabled = enable
272273
busCompareUnregister10000TimesBtn.isEnabled = enable
273274
}
274275

lib/base/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dependencies {
1010
api Config.depConfig.kotlin.dep
1111
api Config.depConfig.free_proguard.dep
1212
api Config.depConfig.swipe_panel.dep
13-
api Config.depConfig.eventbus.dep
13+
api Config.depConfig.eventbus.lib.dep
1414
compileOnly Config.depConfig.leakcanary.android_no_op.dep
1515
}

lib/utilcode/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ dependencies {
2020
testImplementation Config.depConfig.test.junit.dep
2121
testImplementation Config.depConfig.test.robolectric.dep
2222
testImplementation Config.depConfig.support.appcompat_v7.dep
23-
testImplementation Config.depConfig.eventbus.dep
23+
testImplementation Config.depConfig.eventbus.lib.dep
2424
}

lib/utilcode/proguard-rules.pro

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,10 @@
1515
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
1616
# public *;
1717
#}
18-
-dontwarn com.blankj.utilcode.**
18+
-dontwarn com.blankj.utilcode.**
19+
20+
-keepclassmembers class * {
21+
@com.blankj.utilcode.util.BusUtils$Bus <methods>;
22+
}
23+
24+
-keepattributes *Annotation*

0 commit comments

Comments
 (0)