Merge branch 'release/2.1.0'

CHANGELOG.md

@@ -1,6 +1,34 @@
-# Change Log
+# Changelog
+
+## [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)
+
+**Implemented enhancements:**
+
+- Auto Switch Theme based on --console value and --parallel [\#149](https://github.com/radarsh/gradle-test-logger-plugin/issues/149)
+
+**Fixed bugs:**
+
+- Theme is defaulted to plain even when maxForks is greater than 1 [\#139](https://github.com/radarsh/gradle-test-logger-plugin/issues/139)
+- Plugin version 1.7.1 not working with Gradle 4.8.1  [\#138](https://github.com/radarsh/gradle-test-logger-plugin/issues/138)
+
+**Closed issues:**
+
+- Upgrade to Gradle 6.4.1 [\#150](https://github.com/radarsh/gradle-test-logger-plugin/issues/150)
+- Upgrade to Gradle 6.2 [\#143](https://github.com/radarsh/gradle-test-logger-plugin/issues/143)
+- Add support for kotlin-dsl [\#127](https://github.com/radarsh/gradle-test-logger-plugin/issues/127)
+
+**Merged pull requests:**
+
+- Upgrade to Gradle 6.4.1 [\#151](https://github.com/radarsh/gradle-test-logger-plugin/pull/151) ([radarsh](https://github.com/radarsh))
+- Upgrade to Gradle 6.2 [\#144](https://github.com/radarsh/gradle-test-logger-plugin/pull/144) ([radarsh](https://github.com/radarsh))
+- Seamlessly switch to parallel theme [\#142](https://github.com/radarsh/gradle-test-logger-plugin/pull/142) ([radarsh](https://github.com/radarsh))
+- Add missing inputs to "functionalTest" task [\#140](https://github.com/radarsh/gradle-test-logger-plugin/pull/140) ([theosotr](https://github.com/theosotr))
+- Configuration option for changing the log level [\#124](https://github.com/radarsh/gradle-test-logger-plugin/pull/124) ([rabidaudio](https://github.com/rabidaudio))
+
+## [v2.0.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v2.0.0) (2019-10-10)
 
-## [2.0.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v2.0.0) (2019-10-10)
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.7.1...v2.0.0)
 
 **Closed issues:**
@@ -19,6 +47,7 @@
 - Upgrade to Gradle 5.2 [\#107](https://github.com/radarsh/gradle-test-logger-plugin/pull/107) ([radarsh](https://github.com/radarsh))
 
 ## [v1.7.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.7.1) (2019-10-07)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.7.0...v1.7.1)
 
 **Closed issues:**
@@ -36,6 +65,7 @@
 - Clarify documentation [\#121](https://github.com/radarsh/gradle-test-logger-plugin/pull/121) ([radarsh](https://github.com/radarsh))
 
 ## [v1.7.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.7.0) (2019-05-29)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.6.0...v1.7.0)
 
 **Closed issues:**
@@ -59,6 +89,7 @@
 - Fix double escaping of brackets [\#108](https://github.com/radarsh/gradle-test-logger-plugin/pull/108) ([radarsh](https://github.com/radarsh))
 
 ## [v1.6.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.6.0) (2018-11-20)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.5.0...v1.6.0)
 
 **Implemented enhancements:**
@@ -83,6 +114,7 @@
 - Configure testlogger for each task [\#93](https://github.com/radarsh/gradle-test-logger-plugin/pull/93) ([radarsh](https://github.com/radarsh))
 
 ## [v1.5.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.5.0) (2018-09-08)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.4.0...v1.5.0)
 
 **Implemented enhancements:**
@@ -109,6 +141,7 @@
 - Filter test results by type [\#77](https://github.com/radarsh/gradle-test-logger-plugin/pull/77) ([radarsh](https://github.com/radarsh))
 
 ## [v1.4.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.4.0) (2018-07-31)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.3.1...v1.4.0)
 
 **Implemented enhancements:**
@@ -130,6 +163,7 @@
 - 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)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.3.0...v1.3.1)
 
 **Closed issues:**
@@ -141,6 +175,7 @@
 - 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)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.2.0...v1.3.0)
 
 **Implemented enhancements:**
@@ -165,6 +200,7 @@
 - Added support for nested JUnit5 tests. [\#55](https://github.com/radarsh/gradle-test-logger-plugin/pull/55) ([mithomas](https://github.com/mithomas))
 
 ## [v1.2.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.2.0) (2018-03-31)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.1.2...v1.2.0)
 
 **Implemented enhancements:**
@@ -188,6 +224,7 @@
 - Upgrade to Gradle 4.4 [\#46](https://github.com/radarsh/gradle-test-logger-plugin/pull/46) ([radarsh](https://github.com/radarsh))
 
 ## [v1.1.2](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.1.2) (2017-11-07)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.1.1...v1.1.2)
 
 **Fixed bugs:**
@@ -199,6 +236,7 @@
 - Erase ahead before writing every line [\#43](https://github.com/radarsh/gradle-test-logger-plugin/pull/43) ([radarsh](https://github.com/radarsh))
 
 ## [v1.1.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.1.1) (2017-11-06)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.1.0...v1.1.1)
 
 **Fixed bugs:**
@@ -210,6 +248,7 @@
 - Erase ahead before writing summary text [\#41](https://github.com/radarsh/gradle-test-logger-plugin/pull/41) ([radarsh](https://github.com/radarsh))
 
 ## [v1.1.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.1.0) (2017-11-06)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.0.1...v1.1.0)
 
 **Implemented enhancements:**
@@ -239,6 +278,7 @@
 - Fix test instability [\#24](https://github.com/radarsh/gradle-test-logger-plugin/pull/24) ([radarsh](https://github.com/radarsh))
 
 ## [v1.0.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.0.1) (2017-10-15)
+
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.0.0...v1.0.1)
 
 **Implemented enhancements:**
@@ -266,6 +306,9 @@
 - Add Configuration for AppVeyor [\#9](https://github.com/radarsh/gradle-test-logger-plugin/pull/9) ([baynezy](https://github.com/baynezy))
 
 ## [v1.0.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.0.0) (2017-09-29)
+
+[Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/577a89fd0a8f1621802527317ee0bcfbd0f3f49e...v1.0.0)
+
 **Implemented enhancements:**
 
 - Publish plugin [\#5](https://github.com/radarsh/gradle-test-logger-plugin/issues/5)
@@ -284,4 +327,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

CONTRIBUTING.md

@@ -0,0 +1,55 @@
+# Contributing
+
+Thanks for considering to contribute to gradle-test-logger-plugin. Here are the house rules:
+
+## Branching model
+
+The project uses Git flow. It's best to install the [Git flow extensions](https://github.com/nvie/gitflow) before you get started.
+
+## Commit messages
+
+Try to come up with short but meaningful commit messages in an imperative tone. [How to write a Git commit message](https://chris.beams.io/posts/git-commit/) is a great starting point.
+
+## Testing
+
+The project uses Groovy based [Spock Framework](http://spockframework.org/spock/docs/1.3/all_in_one.html) for both unit and functional tests. Spock is an extremely expressive tool for writing tests for code written in any JVM language.
+
+## Formatting
+
+The project uses [`.editorconfig`](https://editorconfig.org/) for setting some basic rules. The only additional thing we ask you to do is to make sure that statements after each label in Spock tests are indented using 4 spaces as follows:
+
+```groovy
+def "suite text"() {
+    given:
+        testDescriptorMock.classDisplayName >> 'ClassName'
+    when:
+        def actual = theme.suiteText(testDescriptorMock, testResultMock)
+    then:
+        actual == "ClassName${lineSeparator()}"
+}
+```
+
+## Merging
+
+Make sure that your rebase against develop first. Merging develop into a feature branch is discouraged. If you have several commits in your branch, squash them all into one commit as you rebase. 
+
+If you have totally separate units of work going into the same branch, then it's OK to have these as separate commits. For example, if you have two commits "Implement feature x" and "Upgrade jansi version" on the same feature branch, it's OK to not squash them.
+
+## Releasing
+
+1. `git flow release start <new version>`
+2. Edit gradle.properties to have the new version
+3. Edit README.md to have the new version
+4. Generate a new changelog. See [Generating a changelog](#generating-a-changelog) for more info.
+5. Commit all files using `git commit -am 'Release version <new version>`
+6. `git flow release finish <new version>`
+7. Tag the new release `v<new version>`
+8. Push to develop, master and tags using `git push origin develop && git push origin master && git push origin --tags`
+
+### Generating a changelog
+
+The project uses [GitHub changelog generator](https://github.com/github-changelog-generator/github-changelog-generator) to make the process of generating changelogs simpler. After installing it, run
+
+```sh
+github_changelog_generator --token <token> --user radarsh --project gradle-test-logger-plugin --enhancement-labels feature --unreleased-label <new version> --future-release v<new version>
+```

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.0.0'
+    id 'com.adarshr.test-logger' version '2.1.0'
 }
 ```
 
@@ -39,7 +39,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.adarshr:gradle-test-logger-plugin:2.0.0'
+        classpath 'com.adarshr:gradle-test-logger-plugin:2.1.0'
     }
 }
 
@@ -72,6 +72,7 @@ testlogger {
     showPassedStandardStreams true
     showSkippedStandardStreams true
     showFailedStandardStreams true
+    logLevel 'lifecycle'
 }
 ```
 
@@ -263,6 +264,17 @@ testlogger {
 By default all the above three flags are turned on. If you have chosen to display standard streams by setting
 `showStandardStreams` flag to `true`, any output produced by filtered out tests will not be displayed.
 
+### Change log level
+
+By default, results are output at the standard `lifecycle` [Gradle log level](https://docs.gradle.org/current/userguide/logging.html#sec:choosing_a_log_level). This can be configured with `logLevel`. For example, the following will output
+the results even on runs with `--quiet`.
+
+```groovy
+testlogger {
+    logLevel 'quiet'
+}
+```
+
 ### Relationship between `testlogger` and `Test.testLogging`
 
 Where possible, the plugin's `testlogger` extension tries to react to equivalent properties of Gradle's `Test.testLogging` 

build.gradle

@@ -5,19 +5,13 @@ buildscript {
 }
 
 plugins {
-    id 'com.gradle.build-scan' version '2.4.2'
     id 'groovy'
     id 'java-gradle-plugin'
     id 'maven-publish'
     id 'idea'
     id 'jacoco'
     id 'com.gradle.plugin-publish' version '0.10.1'
-    id 'com.github.kt3k.coveralls' version '2.8.4'
-}
-
-buildScan {
-    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-    termsOfServiceAgree = 'yes'
+    id 'com.github.kt3k.coveralls' version '2.9.0'
 }
 
 def thisPlugin =
@@ -91,6 +85,7 @@ test {
 }
 
 task functionalTest(type: Test) {
+    inputs.dir "$projectDir/src/test-functional/resources"
     maxParallelForks = 2
     testClassesDirs = sourceSets.functionalTest.output.classesDirs
     classpath = sourceSets.test.runtimeClasspath + sourceSets.functionalTest.runtimeClasspath

gradle.properties

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

gradle/coverage.gradle

@@ -1,5 +1,5 @@
 jacoco {
-    toolVersion '0.8.2'
+    toolVersion '0.8.5'
 }
 
 jacocoTestReport {

gradle/publishing.gradle

@@ -1,5 +1,5 @@
 task sourceJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +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
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 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%
 

settings.gradle

@@ -1 +1,12 @@
+plugins {
+    id 'com.gradle.enterprise' version '3.1.1'
+}
+
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+        termsOfServiceAgree = 'yes'
+    }
+}
+
 rootProject.name = 'gradle-test-logger-plugin'