Skip to content

Commit 269d5dd

Browse files
committed
Merge branch 'release/2.0.0'
2 parents 8b7e6b6 + 276ed62 commit 269d5dd

File tree

29 files changed

+208
-79
lines changed

29 files changed

+208
-79
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: radarsh
7+
8+
---
9+
10+
**Description**
11+
12+
A clear and concise description of what problem you are facing.
13+
14+
**Versions**
15+
16+
- Test logger version:
17+
- Gradle version:
18+
- Java version:
19+
20+
**Type of test being run**
21+
22+
Whether it is JUnit, Spock, TestNg, or anything else. Also, try to include a sample test here.
23+
24+
**Test logger configuration**
25+
26+
Paste your test logger configuration here.
27+
28+
**Screenshots**
29+
30+
If possible, add screenshots to help explain your problem.
31+
32+
**Additional information**
33+
34+
Add any other information about the problem here.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: Documentation issue
3+
about: Clarify something about the documentation
4+
title: ''
5+
labels: documentation
6+
assignees: radarsh
7+
8+
---
9+
10+
**Description**
11+
12+
Explain what needs clarifying and where.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: feature
6+
assignees: radarsh
7+
8+
---
9+
10+
**Description**
11+
12+
A clear and concise description of what the feature should do.
13+
14+
**Additional information**
15+
16+
Supplement with examples, samples from other projects, etc here.

.github/ISSUE_TEMPLATE/question.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: Question
3+
about: Ask a question
4+
title: ''
5+
labels: question
6+
assignees: radarsh
7+
8+
---
9+
10+
**Description**
11+
12+
Ask your question here.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: Technical debt
3+
about: Create a technical debt issue
4+
title: ''
5+
labels: technical debt
6+
assignees: radarsh
7+
8+
---
9+
10+
**Description**
11+
12+
Describe the technical debt here.

CHANGELOG.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
11
# Change Log
22

3-
## [v1.7.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.7.1) (2019-10-07)
3+
## [2.0.0](https://github.com/radarsh/gradle-test-logger-plugin/tree/v2.0.0) (2019-10-10)
4+
[Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.7.1...v2.0.0)
5+
6+
**Closed issues:**
7+
8+
- Upgrade versions of everything [\#132](https://github.com/radarsh/gradle-test-logger-plugin/issues/132)
9+
- Upgrade to Gradle 5.6.2 [\#129](https://github.com/radarsh/gradle-test-logger-plugin/issues/129)
10+
- Upgrade to Gradle 5.2 [\#102](https://github.com/radarsh/gradle-test-logger-plugin/issues/102)
411

5-
[Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.7.0...v.1.7.1)
12+
**Merged pull requests:**
13+
14+
- Update issue templates [\#135](https://github.com/radarsh/gradle-test-logger-plugin/pull/135) ([radarsh](https://github.com/radarsh))
15+
- Switch to modern Gradle dependency configurations [\#134](https://github.com/radarsh/gradle-test-logger-plugin/pull/134) ([radarsh](https://github.com/radarsh))
16+
- Upgrade all dependency versions [\#133](https://github.com/radarsh/gradle-test-logger-plugin/pull/133) ([radarsh](https://github.com/radarsh))
17+
- Remove references to Gradle 2.1 [\#131](https://github.com/radarsh/gradle-test-logger-plugin/pull/131) ([radarsh](https://github.com/radarsh))
18+
- Upgrade to Gradle 5.6.2 [\#130](https://github.com/radarsh/gradle-test-logger-plugin/pull/130) ([radarsh](https://github.com/radarsh))
19+
- Upgrade to Gradle 5.2 [\#107](https://github.com/radarsh/gradle-test-logger-plugin/pull/107) ([radarsh](https://github.com/radarsh))
20+
21+
## [v1.7.1](https://github.com/radarsh/gradle-test-logger-plugin/tree/v1.7.1) (2019-10-07)
22+
[Full Changelog](https://github.com/radarsh/gradle-test-logger-plugin/compare/v1.7.0...v1.7.1)
623

724
**Closed issues:**
825

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ Scroll down for more themes and customisation options or visit the [screenshots
2121

2222
## Usage
2323

24-
### Modern Gradle
24+
### Using the plugins DSL
2525

2626
```groovy
2727
plugins {
28-
id 'com.adarshr.test-logger' version '1.7.1'
28+
id 'com.adarshr.test-logger' version '2.0.0'
2929
}
3030
```
3131

32-
### Gradle < 2.1
32+
### Using legacy plugin application
3333

3434
```groovy
3535
buildscript {
@@ -39,13 +39,15 @@ buildscript {
3939
}
4040
}
4141
dependencies {
42-
classpath 'com.adarshr:gradle-test-logger-plugin:1.7.1'
42+
classpath 'com.adarshr:gradle-test-logger-plugin:2.0.0'
4343
}
4444
}
4545
4646
apply plugin: 'com.adarshr.test-logger'
4747
```
4848

49+
Note: Test logger 2.x is incompatible with Gradle 4.x; please use test logger 1.7.1.
50+
4951
## Configuration
5052

5153
The plugin registers an extension called `testlogger` (all lowercase and one word) at project level

build.gradle

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
buildscript {
22
dependencies {
3-
classpath 'org.fusesource.jansi:jansi:1.16'
3+
classpath 'org.fusesource.jansi:jansi:1.18'
44
}
55
}
66

77
plugins {
8-
id 'com.gradle.build-scan' version '1.16'
8+
id 'com.gradle.build-scan' version '2.4.2'
99
id 'groovy'
1010
id 'java-gradle-plugin'
1111
id 'maven-publish'
1212
id 'idea'
1313
id 'jacoco'
14-
id 'com.gradle.plugin-publish' version '0.10.0'
15-
id 'com.github.kt3k.coveralls' version '2.8.2'
14+
id 'com.gradle.plugin-publish' version '0.10.1'
15+
id 'com.github.kt3k.coveralls' version '2.8.4'
1616
}
1717

1818
buildScan {
@@ -43,24 +43,24 @@ sourceSets {
4343
}
4444

4545
dependencies {
46-
compile gradleApi()
47-
compile localGroovy()
48-
compile 'org.fusesource.jansi:jansi:1.16'
46+
implementation gradleApi()
47+
implementation localGroovy()
48+
implementation 'org.fusesource.jansi:jansi:1.18'
4949

50-
testCompile gradleTestKit()
51-
testCompile('org.spockframework:spock-core:1.1-groovy-2.4') {
50+
testImplementation gradleTestKit()
51+
testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') {
5252
exclude module: 'groovy-all'
5353
}
54-
testCompile 'net.bytebuddy:byte-buddy:1.7.5'
55-
testCompile 'org.objenesis:objenesis:2.6'
56-
testCompile 'commons-io:commons-io:2.5'
54+
testImplementation 'net.bytebuddy:byte-buddy:1.10.1'
55+
testImplementation 'org.objenesis:objenesis:3.1'
56+
testImplementation 'commons-io:commons-io:2.6'
5757

58-
functionalTestCompile localGroovy()
59-
functionalTestCompile gradleTestKit()
60-
functionalTestCompile('org.spockframework:spock-core:1.1-groovy-2.4') {
58+
functionalTestImplementation localGroovy()
59+
functionalTestImplementation gradleTestKit()
60+
functionalTestImplementation('org.spockframework:spock-core:1.3-groovy-2.5') {
6161
exclude module: 'groovy-all'
6262
}
63-
functionalTestCompile 'commons-io:commons-io:2.5'
63+
functionalTestImplementation 'commons-io:commons-io:2.6'
6464
}
6565

6666
gradlePlugin {
@@ -98,11 +98,6 @@ task functionalTest(type: Test) {
9898
minHeapSize '128m'
9999
maxHeapSize '512m'
100100

101-
jacoco {
102-
append = true
103-
destinationFile = file("${buildDir}/jacoco/test.exec")
104-
}
105-
106101
testlogger {
107102
theme 'mocha-parallel'
108103
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=1.7.1
1+
version=2.0.0
22
group=com.adarshr
33
org.gradle.daemon=true
44
org.gradle.caching=false

gradle/coverage.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ jacoco {
33
}
44

55
jacocoTestReport {
6+
executionData "${project.buildDir}/jacoco/test.exec", "${project.buildDir}/jacoco/functionalTest.exec"
7+
68
reports {
79
xml.enabled = true
810
html.enabled = true

0 commit comments

Comments
 (0)