Skip to content

Commit

Permalink
Update to gradle 5.2.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
jsalinaspolo committed Mar 5, 2019
1 parent 1e7456a commit 53b27c3
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .gitignore
@@ -1,5 +1,5 @@
.idea
.iml
*.iml

.gradle

Expand Down
38 changes: 20 additions & 18 deletions build.gradle
Expand Up @@ -14,13 +14,14 @@ plugins {
}

group 'com.jspcore'
version '0.4.6-SNAPSHOT'
version '0.4.7-SNAPSHOT'
description = 'A testing library for assert logging messages.'

apply plugin: 'idea'
apply plugin: 'groovy'
apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'java-library'

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand All @@ -32,19 +33,20 @@ repositories {
ext {
junit5_version = "5.2.0"
}

dependencies {
compile "org.slf4j:slf4j-api:1.7.22"
compile "ch.qos.logback:logback-classic:1.1.8"
compile "org.hamcrest:hamcrest-library:1.3"
compile "com.jayway.awaitility:awaitility:1.7.0"
compile "junit:junit:4.12"
compile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
compile 'org.spockframework:spock-core:1.1-groovy-2.4'
testCompile "org.assertj:assertj-core:3.6.1"
testRuntime "org.junit.jupiter:junit-jupiter-engine:$junit5_version"
testCompile "org.junit.jupiter:junit-jupiter-params:$junit5_version"
testRuntime "org.junit.vintage:junit-vintage-engine:$junit5_version"
api "org.hamcrest:hamcrest-library:2.1"
implementation "org.slf4j:slf4j-api:1.7.22"
implementation "ch.qos.logback:logback-classic:1.1.8"
implementation "org.awaitility:awaitility:3.1.6"
implementation "junit:junit:4.12"
implementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
implementation 'org.spockframework:spock-core:1.3-groovy-2.5'

testImplementation "org.assertj:assertj-core:3.6.1"
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit5_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit5_version"
testImplementation "org.junit.vintage:junit-vintage-engine:$junit5_version"
}

test {
Expand Down Expand Up @@ -98,8 +100,8 @@ task sourceJar(type: Jar) {
from sourceSets.main.allJava
}

task wrapper(type: Wrapper) {
gradleVersion = '4.8.1'
wrapper {
gradleVersion = '5.2.1'
}

publishing {
Expand All @@ -108,7 +110,7 @@ publishing {
from components.java
groupId 'com.jspcore'
artifactId 'logcapture'
version '0.4.6'
version '0.4.7'

artifacts {
artifact sourceJar {
Expand Down Expand Up @@ -142,8 +144,8 @@ bintray {
licenses = ['MIT']
vcsUrl = 'https://github.com/mustaine/logcapture.git'
version {
name = '0.4.6'
vcsTag = '0.4.6'
name = '0.4.7'
vcsTag = '0.4.7'
released = new Date()
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
@@ -0,0 +1 @@
org.gradle.parallel=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
2 changes: 1 addition & 1 deletion src/main/java/com/logcapture/LogbackInterceptor.java
Expand Up @@ -11,8 +11,8 @@
import java.util.concurrent.Callable;
import java.util.function.Supplier;

import static com.jayway.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;
import static org.slf4j.Logger.ROOT_LOGGER_NAME;

class LogbackInterceptor {
Expand Down
@@ -1,6 +1,7 @@
package com.logcapture.spock

import com.logcapture.junit.LogCaptureRuleShould
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import spock.lang.Shared

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

class LogCaptureSpecShould extends LogCaptureSpec {

@Shared log = LoggerFactory.getLogger(LogCaptureRuleShould.class)
@Shared Logger log = LoggerFactory.getLogger(LogCaptureRuleShould.class)

def "verify missing events"() {
expect:
Expand Down
Expand Up @@ -14,7 +14,7 @@
import static org.hamcrest.Matchers.not;


public class LogCaptureRegisterExtensionShould {
class LogCaptureRegisterExtensionShould {
private final Logger log = LoggerFactory.getLogger(LogCaptureRuleShould.class);

@RegisterExtension
Expand Down

0 comments on commit 53b27c3

Please sign in to comment.