Skip to content

Commit 53b27c3

Browse files
committed
Update to gradle 5.2.1.
1 parent 1e7456a commit 53b27c3

File tree

7 files changed

+27
-23
lines changed

7 files changed

+27
-23
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.idea
2-
.iml
2+
*.iml
33

44
.gradle
55

build.gradle

+20-18
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ plugins {
1414
}
1515

1616
group 'com.jspcore'
17-
version '0.4.6-SNAPSHOT'
17+
version '0.4.7-SNAPSHOT'
1818
description = 'A testing library for assert logging messages.'
1919

2020
apply plugin: 'idea'
2121
apply plugin: 'groovy'
2222
apply plugin: 'maven'
2323
apply plugin: 'maven-publish'
24+
apply plugin: 'java-library'
2425

2526
sourceCompatibility = 1.8
2627
targetCompatibility = 1.8
@@ -32,19 +33,20 @@ repositories {
3233
ext {
3334
junit5_version = "5.2.0"
3435
}
36+
3537
dependencies {
36-
compile "org.slf4j:slf4j-api:1.7.22"
37-
compile "ch.qos.logback:logback-classic:1.1.8"
38-
compile "org.hamcrest:hamcrest-library:1.3"
39-
compile "com.jayway.awaitility:awaitility:1.7.0"
40-
compile "junit:junit:4.12"
41-
compile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
42-
compile 'org.spockframework:spock-core:1.1-groovy-2.4'
43-
44-
testCompile "org.assertj:assertj-core:3.6.1"
45-
testRuntime "org.junit.jupiter:junit-jupiter-engine:$junit5_version"
46-
testCompile "org.junit.jupiter:junit-jupiter-params:$junit5_version"
47-
testRuntime "org.junit.vintage:junit-vintage-engine:$junit5_version"
38+
api "org.hamcrest:hamcrest-library:2.1"
39+
implementation "org.slf4j:slf4j-api:1.7.22"
40+
implementation "ch.qos.logback:logback-classic:1.1.8"
41+
implementation "org.awaitility:awaitility:3.1.6"
42+
implementation "junit:junit:4.12"
43+
implementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
44+
implementation 'org.spockframework:spock-core:1.3-groovy-2.5'
45+
46+
testImplementation "org.assertj:assertj-core:3.6.1"
47+
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit5_version"
48+
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit5_version"
49+
testImplementation "org.junit.vintage:junit-vintage-engine:$junit5_version"
4850
}
4951

5052
test {
@@ -98,8 +100,8 @@ task sourceJar(type: Jar) {
98100
from sourceSets.main.allJava
99101
}
100102

101-
task wrapper(type: Wrapper) {
102-
gradleVersion = '4.8.1'
103+
wrapper {
104+
gradleVersion = '5.2.1'
103105
}
104106

105107
publishing {
@@ -108,7 +110,7 @@ publishing {
108110
from components.java
109111
groupId 'com.jspcore'
110112
artifactId 'logcapture'
111-
version '0.4.6'
113+
version '0.4.7'
112114

113115
artifacts {
114116
artifact sourceJar {
@@ -142,8 +144,8 @@ bintray {
142144
licenses = ['MIT']
143145
vcsUrl = 'https://github.com/mustaine/logcapture.git'
144146
version {
145-
name = '0.4.6'
146-
vcsTag = '0.4.6'
147+
name = '0.4.7'
148+
vcsTag = '0.4.7'
147149
released = new Date()
148150
}
149151
}

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

src/main/java/com/logcapture/LogbackInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import java.util.concurrent.Callable;
1212
import java.util.function.Supplier;
1313

14-
import static com.jayway.awaitility.Awaitility.await;
1514
import static java.util.concurrent.TimeUnit.SECONDS;
15+
import static org.awaitility.Awaitility.await;
1616
import static org.slf4j.Logger.ROOT_LOGGER_NAME;
1717

1818
class LogbackInterceptor {

src/test/groovy/com/logcapture/spock/LogCaptureSpecShould.groovy

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.logcapture.spock
22

33
import com.logcapture.junit.LogCaptureRuleShould
4+
import org.slf4j.Logger
45
import org.slf4j.LoggerFactory
56
import spock.lang.Shared
67

@@ -13,7 +14,7 @@ import static org.hamcrest.Matchers.not
1314

1415
class LogCaptureSpecShould extends LogCaptureSpec {
1516

16-
@Shared log = LoggerFactory.getLogger(LogCaptureRuleShould.class)
17+
@Shared Logger log = LoggerFactory.getLogger(LogCaptureRuleShould.class)
1718

1819
def "verify missing events"() {
1920
expect:

src/test/java/com/logcapture/junit5/LogCaptureRegisterExtensionShould.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static org.hamcrest.Matchers.not;
1515

1616

17-
public class LogCaptureRegisterExtensionShould {
17+
class LogCaptureRegisterExtensionShould {
1818
private final Logger log = LoggerFactory.getLogger(LogCaptureRuleShould.class);
1919

2020
@RegisterExtension

0 commit comments

Comments
 (0)