Merge branch 'release/3.0.0'

radarsh · Apr 1, 2021 · 2f078e5 · 2f078e5
2 parents 7330002 + 5fb1c17
commit 2f078e5
Show file tree

Hide file tree

Showing 38 changed files with 993 additions and 415 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,42 @@
 # Changelog
 
-## [v2.1.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v2.1.1) (2020-10-15)
+## [v3.0.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v3.0.0) (2021-04-01)
+
+[Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v2.1.1...v3.0.0)
+
+**Implemented enhancements:**
+
+- Display start of the test [\#165](https://github.com/radarsh/gradle-test-logger-plugin/issues/165)
+
+**Fixed bugs:**
+
+- System property usage causes Gradle 7 to complain \(when using --configuration-cache\) [\#195](https://github.com/radarsh/gradle-test-logger-plugin/issues/195)
+- Stack trace does not show application code [\#170](https://github.com/radarsh/gradle-test-logger-plugin/issues/170)
+- Incompatible with Gradle Configuration Cache [\#163](https://github.com/radarsh/gradle-test-logger-plugin/issues/163)
+- evaluationDependsOnChildren\(\): No output at all \(Gradle 6.6 RC2\) [\#156](https://github.com/radarsh/gradle-test-logger-plugin/issues/156)
+
+**Closed issues:**
+
+- Upgrade to Gradle 6.7 [\#172](https://github.com/radarsh/gradle-test-logger-plugin/issues/172)
+- Kotlin DSL [\#137](https://github.com/radarsh/gradle-test-logger-plugin/issues/137)
+- Document TestLoggerExtension class [\#136](https://github.com/radarsh/gradle-test-logger-plugin/issues/136)
+
+**Merged pull requests:**
+
+- Document Kotlin DSL [\#200](https://github.com/radarsh/gradle-test-logger-plugin/pull/200) ([radarsh](https://github.com/radarsh))
+- Document extension properties [\#199](https://github.com/radarsh/gradle-test-logger-plugin/pull/199) ([radarsh](https://github.com/radarsh))
+- Bump objenesis from 3.1 to 3.2 [\#197](https://github.com/radarsh/gradle-test-logger-plugin/pull/197) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump jansi from 1.18 to 2.3.2 [\#196](https://github.com/radarsh/gradle-test-logger-plugin/pull/196) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump com.github.kt3k.coveralls from 2.9.0 to 2.11.0 [\#194](https://github.com/radarsh/gradle-test-logger-plugin/pull/194) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump byte-buddy from 1.10.17 to 1.10.22 [\#193](https://github.com/radarsh/gradle-test-logger-plugin/pull/193) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump com.gradle.plugin-publish from 0.12.0 to 0.13.0 [\#189](https://github.com/radarsh/gradle-test-logger-plugin/pull/189) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Fix for NPE when the exception in the TestResult is null. [\#180](https://github.com/radarsh/gradle-test-logger-plugin/pull/180) ([osh-onstructive](https://github.com/osh-onstructive))
+- Bump byte-buddy from 1.10.1 to 1.10.17 [\#176](https://github.com/radarsh/gradle-test-logger-plugin/pull/176) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump commons-io from 2.6 to 2.8.0 [\#174](https://github.com/radarsh/gradle-test-logger-plugin/pull/174) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Upgrade to Gradle 6.7 [\#173](https://github.com/radarsh/gradle-test-logger-plugin/pull/173) ([radarsh](https://github.com/radarsh))
+- Use lazy configuration [\#171](https://github.com/radarsh/gradle-test-logger-plugin/pull/171) ([radarsh](https://github.com/radarsh))
+
+## [v2.1.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v2.1.1) (2020-10-14)
 
 [Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v2.1.0...v2.1.1)
 
@@ -18,6 +54,7 @@
 
 - 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))
+- Upgrade plugin publish plugin [\#155](https://github.com/radarsh/gradle-test-logger-plugin/pull/155) ([radarsh](https://github.com/radarsh))
 
 ## [v2.1.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v2.1.0) (2020-06-30)
 
@@ -178,6 +215,7 @@
 - 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)
@@ -190,7 +228,6 @@
 
 **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)

diff --git a/README.md b/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.1'
+ id 'com.adarshr.test-logger' version '3.0.0'
 }
 ```
 
@@ -39,14 +39,20 @@ buildscript {
  }
  }
  dependencies {
- classpath 'com.adarshr:gradle-test-logger-plugin:2.1.1'
+ classpath 'com.adarshr:gradle-test-logger-plugin:3.0.0'
  }
 }
 
 apply plugin: 'com.adarshr.test-logger'
 ```
 
-Note: Test logger 2.x is incompatible with Gradle 4.x; please use test logger 1.7.1. 
+### Compatibility matrix
+
+| Test logger version | Minimum Gradle version |
+|---------------------|-----------------------------|
+| 1.x | 4.x |
+| 2.x | 5.x |
+| 3.x | 6.x |
 
 ## Configuration
 
@@ -303,6 +309,49 @@ corresponding property of `Test.testLogging`. The below table demonstrates this
 In other words, an explicitly configured `testlogger` property, despite it being `false`, takes precedence over any 
 value of `Test.testLogging`.
 
+## Kotlin DSL
+
+If you are using the Kotlin DSL, the syntax of `testlogger` extension DSL changes slightly. The following shows the default
+configuration properties using Kotlin DSL style.
+
+```kotlin
+testlogger {
+ theme = ThemeType.STANDARD
+ showExceptions = true
+ showStackTraces = true
+ showFullStackTraces = false
+ showCauses = true
+ slowThreshold = 2000
+ showSummary = true
+ showSimpleNames = false
+ showPassed = true
+ showSkipped = true
+ showFailed = true
+ showStandardStreams = false
+ showPassedStandardStreams = true
+ showSkippedStandardStreams = true
+ showFailedStandardStreams = true
+ logLevel = LogLevel.LIFECYCLE
+}
+```
+
+One gotcha about Kotlin DSL is that if you have subprojects that are trying to use a different testlogger setting compared to
+the parent project, the syntax changes slightly.
+
+```kotlin
+subprojects {
+
+ apply {
+ plugin("com.adarshr.test-logger")
+ }
+
+ configure<TestLoggerExtension> {
+ theme = ThemeType.STANDARD
+ showExceptions = true
+ ...
+ }
+}
+```
 
 ## FAQ
 

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
  dependencies {
- classpath 'org.fusesource.jansi:jansi:1.18'
+ classpath 'org.fusesource.jansi:jansi:2.3.2'
  }
 }
 
@@ -10,8 +10,8 @@ plugins {
  id 'maven-publish'
  id 'idea'
  id 'jacoco'
- id 'com.gradle.plugin-publish' version '0.12.0'
- id 'com.github.kt3k.coveralls' version '2.9.0'
+ id 'com.gradle.plugin-publish' version '0.13.0'
+ id 'com.github.kt3k.coveralls' version '2.11.0'
 }
 
 def thisPlugin =
@@ -45,9 +45,9 @@ dependencies {
  testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') {
  exclude module: 'groovy-all'
  }
- testImplementation 'net.bytebuddy:byte-buddy:1.10.1'
- testImplementation 'org.objenesis:objenesis:3.1'
- testImplementation 'commons-io:commons-io:2.6'
+ testImplementation 'net.bytebuddy:byte-buddy:1.10.22'
+ testImplementation 'org.objenesis:objenesis:3.2'
+ testImplementation 'commons-io:commons-io:2.8.0'
 
  functionalTestImplementation localGroovy()
  functionalTestImplementation gradleTestKit()

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.1.1
+version=3.0.0
 group=com.adarshr
 org.gradle.daemon=true
 org.gradle.caching=false

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
- id 'com.gradle.enterprise' version '3.1.1'
+ id 'com.gradle.enterprise' version '3.4.1'
 }
 
 gradleEnterprise {

diff --git a/src/main/groovy/com/adarshr/gradle/testlogger/TestDescriptorWrapper.groovy b/src/main/groovy/com/adarshr/gradle/testlogger/TestDescriptorWrapper.groovy
@@ -28,7 +28,7 @@ class TestDescriptorWrapper {
  def classDisplayName = testDescriptor.properties.classDisplayName as String
  def useClassDisplayName = classDisplayName && classDisplayName != className && !className.endsWith(classDisplayName)
 
- if (testLoggerExtension.showSimpleNames) {
+ if (testLoggerExtension.getShowSimpleNames()) {
  className = className.substring(className.lastIndexOf('.') + 1)
  className = className.substring(className.lastIndexOf('$') + 1)
  }