Merge pull request #748 from Blankj/1.22.2

1.22.2

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,4 @@
+* `18/12/17` [fix] ToastUtils leak. Publish v1.22.2.
 * `18/12/09` [add] Component for the project.
 * `18/12/04` [add] BusUtils. Publish v1.22.1.
 * `18/11/18` [fix] ToastUtils don't show in the devices grater than API 24 when close the permission of notification. Publish v1.22.0.

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

bus-gradle-plugin/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## v1.6
+修复 inject 时候 zip 操作不对导致混淆出错的问题
+
 ## v1.5
 升级 javassist 来修复 Kotlin 匿名类 NotFoundException
 

bus-gradle-plugin/build.gradle

@@ -7,11 +7,11 @@ apply {
     plugin "java-gradle-plugin"
     from "${rootDir.path}/gradle/pluginPublish.gradle"
     if (bus.isDebug) {
-        plugin 'maven'
+        plugin "maven"
         from "${rootDir.path}/gradle/localMavenUpload.gradle"
     } else {
-        plugin 'com.github.dcendents.android-maven'
-        plugin 'com.jfrog.bintray'
+        plugin "com.github.dcendents.android-maven"
+        plugin "com.jfrog.bintray"
         from "${rootDir.path}/gradle/bintrayUploadJava.gradle"
     }
 }
@@ -26,6 +26,7 @@ gradlePlugin {
 }
 
 dependencies {
+    implementation dep.plugin[0]
     implementation dep.javassist
     implementation dep.commons_io
     implementation gradleApi()

bus-gradle-plugin/src/main/java/com/blankj/bus/BusInject.groovy

@@ -25,9 +25,9 @@ class BusInject {
             callMethod.insertAfter(getInsertContent(bus, true));
         }
         busUtils.writeFile(decompressedJarPath)
-        busUtils.defrost();
+        busUtils.defrost()
         FileUtils.forceDelete(busJar)
-        ZipUtils.zipFile(decompressedJar, busJar)
+        ZipUtils.zipFiles(Arrays.asList(decompressedJar.listFiles()), busJar)
         FileUtils.forceDelete(decompressedJar)
     }
 

bus-gradle-plugin/src/main/java/com/blankj/bus/BusTransform.groovy

@@ -68,11 +68,10 @@ class BusTransform extends Transform {
                 )
                 FileUtils.copyDirectory(dir, dest)
 
-                LogUtils.l("scan dir: " + dirInput.name)
+                LogUtils.l("scan dir: $dir [$dest]")
 
                 busScan.scanDir(dir)
             }
-
             input.jarInputs.each { JarInput jarInput ->// 遍历 jar 文件
                 File jar = jarInput.file
                 JavassistUtils.getPool().appendClassPath(jarInput.file.absolutePath)
@@ -86,21 +85,22 @@ class BusTransform extends Transform {
                 )
                 FileUtils.copyFile(jar, dest)
 
-                if (jumpScan(jarName)) {
-                    LogUtils.l("jump jar: " + jarName)
-                    return
-                }
-
                 if (jarName.startsWith("com.blankj:utilcode:")
                         || jarName.contains("utilcode-lib")) {
                     busScan.busJar = dest
-                    LogUtils.l("bus jar: " + jarName)
+                    LogUtils.l("bus jar: $jarName [$dest]")
                     return
                 }
 
-                LogUtils.l("scan jar: " + jarName)
+                if (jumpScan(jarName)) {
+                    LogUtils.l("jump jar: $jarName [$dest]")
+                    return
+                }
+
+                LogUtils.l("scan jar: $jarName [$dest]")
                 busScan.scanJar(jar)
             }
+
         }
 
         if (busScan.busJar != null) {

bus-gradle-plugin/src/main/java/com/blankj/bus/Config.groovy

@@ -8,7 +8,10 @@ class Config {
             'com.android.support:',
             'com.android.support.constraint:',
             'android.arch.',
-            'com.blankj:'
+            'com.blankj:',
+            'org.jetbrains.kotlin:',
+            'org.jetbrains:',
+            'com.squareup.'
     ]
 
     public static final String FILE_SEP = System.getProperty("file.separator")

config.gradle

@@ -5,12 +5,12 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_022_001
-    versionName = '1.22.1'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_022_002
+    versionName = '1.22.2'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,
-            version: '1.5',
+            version: '1.6',
             group  : 'com.blankj'
     ]
 
@@ -41,7 +41,7 @@ ext {
                     android      : "com.squareup.leakcanary:leakcanary-android:$leakcanary_version",
                     android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version",
             ],
-            free_proguard: "com.blankj:free-proguard:0.0.9",
+            free_proguard: "com.blankj:free-proguard:0.0.7",
             adapt_screen : "com.blankj:adapt-screen:0.0.3",
 
             gson         : "com.google.code.gson:gson:2.8.2",

config_app.gradle

@@ -21,9 +21,12 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
         release {
             minifyEnabled true
-            consumerProguardFiles 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -45,7 +48,7 @@ private String getSuffix() {
     String[] splits = project.name.split("-")
     String suffix = ""
     if (splits.length == 2) {
-        suffix = "." + splits[0]
+        suffix = "_" + splits[0]
     }
     return suffix
 }
@@ -61,7 +64,7 @@ def configSigning(Project pro) {
         properties.load(new FileInputStream(signPropertiesFile))
         signingConfigs {
             release {
-                storeFile file(properties['keystore'])
+                storeFile new File(signPropertiesFile.getParent(), properties['keystore'])
                 storePassword properties['storePassword']
                 keyAlias properties['keyAlias']
                 keyPassword properties['keyPassword']
@@ -75,9 +78,11 @@ def configSigning(Project pro) {
 def configApkName(Project pro) {
     pro.android.applicationVariants.all { variant ->
         if (variant.buildType.name != "debug") {
-            variant.getPackageApplication().outputDirectory = new File(project.rootDir.absolutePath + "/apk")
+            variant.getPackageApplication().outputDirectory = new File("${rootDir.path}/apk")
             variant.getPackageApplication().outputScope.apkDatas.forEach { apkData ->
-                apkData.outputFileName = "util_" + variant.versionName.replace(".", "_") + ".apk"
+                apkData.outputFileName = "util" + suffix +
+                                         "_" + variant.versionName.replace(".", "_") +
+                                         ".apk"
             }
         }
     }