Merge branch 'release/2.1.1'

Author: radarsh

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [v2.1.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v2.1.1) (2020-10-15)
+
+[Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v2.1.0...v2.1.1)
+
+**Fixed bugs:**
+
+- Cannot override logLevel using command line [\#161](https://github.com/radarsh/gradle-test-logger-plugin/issues/161)
+- JetBrains IDEA prints the escape codes instead of switching colors [\#148](https://github.com/radarsh/gradle-test-logger-plugin/issues/148)
+
+**Closed issues:**
+
+- Upgrade to Gradle 6.6 [\#153](https://github.com/radarsh/gradle-test-logger-plugin/issues/153)
+- Incorrect coverage reported by JaCoCo and Coveralls [\#152](https://github.com/radarsh/gradle-test-logger-plugin/issues/152)
+
+**Merged pull requests:**
+
+- Fix issue with overriding logLevel [\#169](https://github.com/radarsh/gradle-test-logger-plugin/pull/169) ([radarsh](https://github.com/radarsh))
+- Upgrade to Gradle 6.6.1 [\#167](https://github.com/radarsh/gradle-test-logger-plugin/pull/167) ([radarsh](https://github.com/radarsh))
+
 ## [v2.1.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v2.1.0) (2020-06-30)
 
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v2.0.0...v2.1.0)
@@ -159,7 +178,6 @@
 - Refactor standard stream collectors into OutputCollector abstraction [\#73](https://github.com/radarsh/gradle-test-logger-plugin/pull/73) ([radarsh](https://github.com/radarsh))
 - Add test for ThemeType [\#71](https://github.com/radarsh/gradle-test-logger-plugin/pull/71) ([radarsh](https://github.com/radarsh))
 - Upgrade to Gradle 4.9 [\#70](https://github.com/radarsh/gradle-test-logger-plugin/pull/70) ([radarsh](https://github.com/radarsh))
-- Limit max memory available to Gradle for CircleCI builds [\#69](https://github.com/radarsh/gradle-test-logger-plugin/pull/69) ([radarsh](https://github.com/radarsh))
 - Add support for parallel test execution [\#66](https://github.com/radarsh/gradle-test-logger-plugin/pull/66) ([radarsh](https://github.com/radarsh))
 
 ## [v1.3.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.3.1) (2018-06-25)
@@ -172,6 +190,7 @@
 
 **Merged pull requests:**
 
+- Limit max memory available to Gradle for CircleCI builds [\#69](https://github.com/radarsh/gradle-test-logger-plugin/pull/69) ([radarsh](https://github.com/radarsh))
 - Turn off bright yellow in standard theme [\#65](https://github.com/radarsh/gradle-test-logger-plugin/pull/65) ([radarsh](https://github.com/radarsh))
 
 ## [v1.3.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.3.0) (2018-06-11)

README.md

@@ -25,7 +25,7 @@ Scroll down for more themes and customisation options or visit the [screenshots
 
 ```groovy
 plugins {
-    id 'com.adarshr.test-logger' version '2.1.0'
+    id 'com.adarshr.test-logger' version '2.1.1'
 }
 ```
 
@@ -39,7 +39,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.adarshr:gradle-test-logger-plugin:2.1.0'
+        classpath 'com.adarshr:gradle-test-logger-plugin:2.1.1'
     }
 }
 

gradle.properties

@@ -1,4 +1,4 @@
-version=2.1.0
+version=2.1.1
 group=com.adarshr
 org.gradle.daemon=true
 org.gradle.caching=false

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -201,15 +201,17 @@ class TestLoggerExtension {
         override(overrides, 'showSkipped', Boolean)
         override(overrides, 'showFailed', Boolean)
         override(overrides, 'showSimpleNames', Boolean)
+        override(overrides, 'logLevel', LogLevel)
 
         this
     }
 
     private void override(Map<String, String> overrides, String name, Class type) {
         if (overrides.containsKey(name)) {
-            String method = Enum.isAssignableFrom(type) ? 'fromName' : 'valueOf'
+            String method = ThemeType.isAssignableFrom(type) ? 'fromName' : 'valueOf'
+            String value = LogLevel.isAssignableFrom(type) ? overrides[name].toUpperCase() : overrides[name]
 
-            setProperty(name, type.invokeMethod(method, overrides[name]))
+            setProperty(name, type.invokeMethod(method, value))
         }
     }
 }

src/main/groovy/com/adarshr/gradle/testlogger/TestLoggerExtension.groovy

@@ -16,7 +16,7 @@ abstract class AbstractFunctionalSpec extends Specification {
 
     private static final String TEST_ROOT = 'src/test-functional/resources'
 
-    private static final String GRADLE_VERSION = '6.4.1'
+    private static final String GRADLE_VERSION = '6.6.1'
 
     @Rule
     TemporaryFolder temporaryFolder

src/test-functional/groovy/com/adarshr/gradle/testlogger/functional/AbstractFunctionalSpec.groovy

@@ -1,6 +1,7 @@
 package com.adarshr.gradle.testlogger
 
 import com.adarshr.gradle.testlogger.theme.ThemeType
+import org.gradle.api.logging.LogLevel
 import org.gradle.api.tasks.testing.logging.TestLogging
 import spock.lang.Specification
 import spock.lang.Unroll
@@ -40,7 +41,8 @@ class TestLoggerExtensionSpec extends Specification {
                 showFailedStandardStreams: 'false',
                 showPassed: 'false',
                 showSkipped: 'false',
-                showFailed: 'false'
+                showFailed: 'false',
+                logLevel: 'warn'
             ]
         when:
             def extension = new TestLoggerExtension()
@@ -57,6 +59,7 @@ class TestLoggerExtensionSpec extends Specification {
             !extension.showPassed
             !extension.showSkipped
             !extension.showFailed
+            extension.logLevel == LogLevel.WARN
     }
 
     def "combine two test extension objects"() {