make log colored & update gradle version

SmartDengg · Apr 2, 2019 · c423ee5 · c423ee5
1 parent de8892c
commit c423ee5
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.2'
     classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
     // NOTE: Do not place your application dependencies here; they belong

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
   implementation localGroovy()
   implementation gradleApi()
-  implementation "com.android.tools.build:gradle:3.2.1"
+  implementation "com.android.tools.build:gradle:3.3.2"
 }
 
 sourceSets {

diff --git a/click-debounce-gradle-plugin/gradle-plugin.gradle b/click-debounce-gradle-plugin/gradle-plugin.gradle
@@ -14,14 +14,10 @@ repositories {
   google()
 }
 
-ext {
-  androidPluginVersion = '3.2.1'
-}
-
 dependencies {
   compile gradleApi()
   compile localGroovy()
-  implementation "com.android.tools.build:gradle:$androidPluginVersion"
+  implementation "com.android.tools.build:gradle:3.3.2"
   implementation 'commons-io:commons-io:2.6'
   implementation 'org.ow2.asm:asm:7.0'
   implementation 'org.ow2.asm:asm-commons:6.0'

diff --git a/...e-gradle-plugin/src/main/groovy/com/smartdengg/plugin/DebounceIncrementalTransform.groovy b/...e-gradle-plugin/src/main/groovy/com/smartdengg/plugin/DebounceIncrementalTransform.groovy
@@ -32,8 +32,7 @@ class DebounceIncrementalTransform extends Transform {
     this.debounceExt = project."${DebounceExtension.NAME}"
     this.weavedVariantClassesMap = weavedVariantClassesMap
     this.isApp = isApp
-    this.debounceOutDir = new File(Joiner.on(File.separatorChar).join(
-        project.buildDir,
+    this.debounceOutDir = new File(Joiner.on(File.separatorChar).join(project.buildDir,
         FD_OUTPUTS,
         'debounce',
         'logs'))
@@ -165,7 +164,8 @@ class DebounceIncrementalTransform extends Transform {
       }
     } finally {
       PrintWriterUtil.closePrintWriter(changedFiles, writer)
-      println "Printing files status to [" + PrintWriterUtil.fileName(changedFiles) + "]"
+      ColoredLogger.logYellow(
+          "SUCCESS: Printing files status to [" + PrintWriterUtil.fileName(changedFiles) + "]")
     }
   }
 }
diff --git a/click-debounce-gradle-plugin/src/main/groovy/com/smartdengg/plugin/OutputMappingTask.groovy b/click-debounce-gradle-plugin/src/main/groovy/com/smartdengg/plugin/OutputMappingTask.groovy
@@ -48,14 +48,14 @@ class OutputMappingTask extends DefaultTask {
         } else {
           state = 'FIRST RUN'
         }
-        println "OUT OF DATE: ${change.file.name}:$state"
+        ColoredLogger.log("OUT OF DATE: ${change.file.name}:$state")
       }
     }
 
     inputs.removed { change ->
       if (change.file.directory) return
       if (loggable && Utils.isMatchCondition(change.file.name)) {
-        println "REMOVED: ${change.file.name}"
+        ColoredLogger.log("REMOVED: ${change.file.name}")
       }
     }
 
@@ -69,13 +69,14 @@ class OutputMappingTask extends DefaultTask {
       }.each { weavedClass ->
         writer.println "${weavedClass.className}:"
         weavedClass.debouncedMethods.each { method ->
-          if (loggable) println "ADD $weavedClass.className : $method"
+          if (loggable) ColoredLogger.log("ADD $weavedClass.className : $method")
           writer.println "\t -> $method"
         }
       }
     } finally {
       PrintWriterUtil.closePrintWriter(mappingFile, writer)
-      println "Success wrote TXT mapping report to [" + PrintWriterUtil.fileName(mappingFile) + "]"
+      ColoredLogger.logYellow(
+          "SUCCESS: Writing TXT mapping report to [" + PrintWriterUtil.fileName(mappingFile) + "]")
     }
   }
 }
diff --git a/click-debounce-lib-android/lib-android.gradle b/click-debounce-lib-android/lib-android.gradle
@@ -1,9 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'smartdengg.clickdebounce'
 
-debounce {
-  loggable = true
-}
+debounce.loggable = true
 
 android {
   compileSdkVersion 26

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 09 12:06:31 CST 2018
+#Tue Apr 02 13:44:20 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip