Merge branch 'master' into androidx

Blankj · Blankj · commit 688442ac2e91 · 2020-10-28T15:28:41.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* `20/10/28` [add] Fix BusUtils ConcurrentModificationException. Publish v1.30.3.
 * `20/10/27` [add] Fix AppUtils#getAppSignatures. Add DeviceUtils#isDevelopmentSettingsEnabled. Publish v1.30.2.
 * `20/10/26` [add] Fix AppUtils#isAppForeground. Publish v1.30.1.
 * `20/10/24` [add] Publish v1.30.0.
diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy
@@ -14,8 +14,8 @@ class Config {
     static compileSdkVersion = 29
     static minSdkVersion = 14
     static targetSdkVersion = 29
-    static versionCode = 1_030_002
-    static versionName = '1.30.2'// E.g. 1.9.72 => 1,009,072
+    static versionCode = 1_030_003
+    static versionName = '1.30.3'// E.g. 1.9.72 => 1,009,072
 
     // lib version
     static gradlePluginVersion = '3.5.2'
diff --git a/lib/utilcode/README-CN.md b/lib/utilcode/README-CN.md
@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.30.2'
+implementation 'com.blankj:utilcode:1.30.3'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.30.2'
+implementation 'com.blankj:utilcodex:1.30.3'
 ```
 
 
diff --git a/lib/utilcode/README.md b/lib/utilcode/README.md
@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.30.2'
+implementation 'com.blankj:utilcode:1.30.3'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.30.2'
+implementation 'com.blankj:utilcodex:1.30.3'
 ```
 
 
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/BusUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/BusUtils.java
@@ -8,7 +8,6 @@
 import java.lang.annotation.Target;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -357,7 +356,7 @@ private void postStickyInner(final String tag, final Object arg) {
             synchronized (mClassName_Tag_Arg4StickyMap) {
                 Map<String, Object> tagArgMap = mClassName_Tag_Arg4StickyMap.get(busInfo.className);
                 if (tagArgMap == null) {
-                    tagArgMap = new HashMap<>();
+                    tagArgMap = new ConcurrentHashMap<>();
                     mClassName_Tag_Arg4StickyMap.put(busInfo.className, tagArgMap);
                 }
                 tagArgMap.put(tag, arg);
diff --git a/lib/utildebug/build.gradle b/lib/utildebug/build.gradle
@@ -1,3 +1,7 @@
+afterEvaluate {
+    verifyReleaseResources.enabled(false)
+}
+
 dependencies {
     compileOnly Config.depConfig.androidx_appcompat.dep
     compileOnly Config.depConfig.androidx_material.dep

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	+* `20/10/28` [add] Fix BusUtils ConcurrentModificationException. Publish v1.30.3.
`1`	`2`	* `20/10/27` [add] Fix AppUtils#getAppSignatures. Add DeviceUtils#isDevelopmentSettingsEnabled. Publish v1.30.2.
`2`	`3`	* `20/10/26` [add] Fix AppUtils#isAppForeground. Publish v1.30.1.
`3`	`4`	* `20/10/24` [add] Publish v1.30.0.