Merge branch 'master' of https://github.com/Blankj/AndroidUtilCode

# Conflicts:
#	build.gradle

Author: liyujiang-gzu

.gitignore

@@ -1,4 +1,5 @@
 *.iml
+*__bus__.json
 .gradle
 /local.properties
 .idea
@@ -7,5 +8,5 @@
 /captures
 .externalNativeBuild
 /apk
-/maven
-__bus__.json
+*.phrof
+/busMaven

.travis.yml

@@ -18,7 +18,7 @@ android:
     email: false
 
 before_install:
-    - yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.2"
+  - yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.2"
 
 script:
-  - ./gradlew build connectedCheck --info
+  - ./gradlew build connectedCheck

CHANGELOG.md

@@ -1,3 +1,37 @@
+* `19/06/20` [fix] BusUtils' permission. Publish v1.24.4.
+* `19/06/19` [fix] UriUtils. Publish v1.24.3.
+* `19/06/18` [add] ClickUtils, ViewUtils.
+* `19/06/07` [fix] LogUtils file name contains ':'. Publish v1.24.2.
+* `19/06/06` [fix] LogUtils write to file. Publish v1.24.1.
+* `19/06/03` [fix] Refactoring framework. Publish v1.24.0.
+* `19/04/25` [fix] LogUtils delete due log.
+* `19/04/24` [upd] The swipe panel.
+* `19/03/17` [fix] The ugly UI.
+* `19/03/14` [fix] AdaptScreenUtils didn't work on some HaWei tablet.
+* `19/03/08` [add] LogUtils support multi process. Publish v1.23.7.
+* `19/03/02` [fix] LogUtils#file.
+* `19/02/28` [fix] ImageUtils#calculateInSampleSize. Publish v1.23.6.
+* `19/02/26` [fix] UriUtils#uri2File. Publish v1.23.5.
+* `19/01/31` [add] HttpUtils.
+* `19/01/30` [add] RomUtils. Publish v1.23.4.
+* `19/01/29` [fix] LogUtils format json when json not start with '{'. Publish v1.23.3.
+* `19/01/28` [fix] KeyboardUtils#fixSoftInputLeaks don't work on the device of HuaWei.
+* `19/01/26` [fix] NetworkUtils#getNetworkType.
+* `19/01/25` [add] CloneUtils, PermissionUtils support request permission of WRITE_SETTINGS and DRAW_OVERLAYS. Publish v1.23.2.
+* `19/01/24` [add] BrightnessUtils and FlashlightUtils.
+* `19/01/23` [add] Modify the demo of utilcode use kotlin. Publish v1.23.1.
+* `19/01/22` [fix] AppUtils#installApp.
+* `19/01/17` [fix] Publish v1.23.0.
+* `19/01/16` [fix] BarUtils get Activity from view and delete the function of set status bar alpha.
+* `19/01/15` [add] ColorUtils.
+* `19/01/04` [add] CacheDiskStaticUtils, CacheDoubleStaticUtils, CacheMemoryStaticUtils.
+* `19/01/03` [add] SPStaticUtils.
+* `19/01/02` [fix] LogUtils log object. Publish v1.22.10.
+* `19/01/01` [add] GsonUtils.
+* `18/12/29` [add] AntiShakeUtils and VibrateUtils. Publish v1.22.9.
+* `18/12/28` [fix] ToastUtils show behind the dialog when close notification.
+* `18/12/27` [fix] LogUtils print StringBuilder failed.
+* `18/12/24` [fix] Utils$ActivityLifecycleImpl.consumeOnActivityDestroyedListener ConcurrentModificationException. Publish v1.22.7.
 * `18/12/22` [fix] AdaptScreenUtils#pt2px don't work when start webview. Publish v1.22.6.
 * `18/12/21` [add] LogUtils support print Map, Collection and Object to String.
 * `18/12/19` [fix] AdaptScreenUtils don't work in MIUI on Android 5.1.1. Publish v1.22.5.

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.22.6-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.4-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

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.22.6-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.4-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

build.gradle

@@ -1,6 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    apply from: 'config.gradle'
     repositories {
         maven {
             url 'https://maven.aliyun.com/repository/public'
@@ -14,18 +13,22 @@ buildscript {
             url 'https://maven.aliyun.com/repository/google'
             name '代替 google()'
         }
-        if (bus.isDebug) {
+        if (gradle.ext.depConfig.plugin_bus.useLocal) {
             maven() {
-                url uri(new File(project.rootDir, "maven"))
+                // use for debug plugin local
+                url new File("busMaven")
             }
         }
         google()
         jcenter()
     }
 
     dependencies {
-        for (plugin in dep.plugin) {
-            classpath plugin
+        // 根据 config 来 configClasspath 各 plugin
+        gradle.ext.depConfig.each { name, config ->
+            if (name.startsWith("plugin_") && config.isApply) {
+                classpath config.remotePath
+            }
         }
     }
 }
@@ -54,7 +57,7 @@ allprojects {
         resolutionStrategy.eachDependency {
             if (it.requested.group == 'com.android.support'
                     && !it.requested.name.contains('multidex')) {
-                it.useVersion support_version
+                it.useVersion gradle.ext.support_version
             }
         }
     }

bus-gradle-plugin/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v1.8
+兼容最新工程组件化
+
+## v1.7
+兼容 utilcodex
+
 ## v1.6
 修复 inject 时候 zip 操作不对导致混淆出错的问题
 

bus-gradle-plugin/build.gradle

@@ -5,14 +5,13 @@ plugins {
 apply {
     plugin "groovy"
     plugin "java-gradle-plugin"
-    from "${rootDir.path}/gradle/pluginPublish.gradle"
-    if (bus.isDebug) {
+    from "${rootDir.path}/gradle/upload/pluginPublish.gradle"
+    if (gradle.ext.depConfig.plugin_bus.useLocal) {
         plugin "maven"
-        from "${rootDir.path}/gradle/localMavenUpload.gradle"
     } else {
         plugin "com.github.dcendents.android-maven"
         plugin "com.jfrog.bintray"
-        from "${rootDir.path}/gradle/bintrayUploadJava.gradle"
+        from "${rootDir.path}/gradle/upload/bintrayUploadJava.gradle"
     }
 }
 
@@ -26,13 +25,15 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation dep.plugin[0]
-    implementation dep.javassist
-    implementation dep.commons_io
+    implementation "com.android.tools.build:gradle:3.4.0"
+    implementation "com.android.tools.build:gradle-api:3.4.0"
+
+    implementation gradle.ext.dep.javassist
+    implementation gradle.ext.dep.commons_io
     implementation gradleApi()
     implementation localGroovy()
 
-    testImplementation dep.junit
+    testImplementation gradle.ext.dep.junit
 }
 
 sourceSets {
@@ -49,8 +50,18 @@ sourceSets {
     }
 }
 
-group = bus.group
-version = bus.version
+group = gradle.ext.depConfig.plugin_bus.groupId
+version = gradle.ext.depConfig.plugin_bus.version
+
+if (gradle.ext.depConfig.plugin_bus.useLocal) {
+    uploadArchives {
+        repositories {
+            mavenDeployer {
+                repository(url: uri(new File(project.rootDir, "busMaven")))
+            }
+        }
+    }
+}
 
 //./gradlew bus-gradle-plugin:bintrayUpload
 //./gradlew publishPlugins

bus-gradle-plugin/com/blankj/bus/BusUtils.class

@@ -1,6 +1,9 @@
+#project
 project.name=StaticBusPlugin
-project.siteUrl=https://github.com/Blankj/StaticBus
-project.gitUrl=https://github.com/Blankj/StaticBus.git
-
+project.groupId=com.blankj
+project.artifactId=bus-gradle-plugin
+project.packaging=aar
+project.siteUrl=https://github.com/Blankj/AndroidUtilCode
+project.gitUrl=https://github.com/Blankj/AndroidUtilCode.git
 #javadoc
-javadoc.name=StaticBus
+javadoc.name=StaticBusPlugin