From 4200c0bf52102aba31c73858d333ddf7e2e56317 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Sat, 11 Dec 2021 20:17:52 +0100 Subject: [PATCH] Update 3rd party dependencies. --- build.gradle | 19 +++++++++---------- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 866de91..9467216 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ apply plugin: "java-library" apply plugin: "groovy" -apply plugin: 'maven' apply plugin: 'jacoco' apply plugin: 'maven-publish' @@ -14,16 +13,16 @@ repositories { dependencies { implementation("org.slf4j:slf4j-api:${slf4jVersion}") - api('com.google.code.gson:gson:2.8.8') - api('com.squareup.okhttp3:okhttp:4.9.1') + api('com.google.code.gson:gson:2.8.9') + api('com.squareup.okhttp3:okhttp:4.9.3') testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}") - testImplementation('com.squareup.okhttp3:mockwebserver:4.9.1') - testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}") - testCompile("org.spockframework:spock-core:${spockVersion}") { + testImplementation('com.squareup.okhttp3:mockwebserver:4.9.3') + testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}") + testImplementation("org.spockframework:spock-core:${spockVersion}") { exclude group: "org.codehaus.groovy" } - testCompile('com.athaydes:spock-reports:2.0-groovy-3.0') { + testImplementation('com.athaydes:spock-reports:2.1.1-groovy-3.0') { transitive = false // this avoids affecting your version of Groovy/Spock } @@ -46,14 +45,14 @@ test { } jacoco { - toolVersion = "0.8.4" + toolVersion = "0.8.7" } jacocoTestReport { group = "verification" reports { - xml.enabled false - csv.enabled false + xml.required = false + csv.required = false html.destination file("${buildDir}/reports/coverage") } afterEvaluate { diff --git a/gradle.properties b/gradle.properties index 3ffab2f..7a93942 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ id = libcvrapi group = biz.nellemann.libs -version = 1.0.8 +version = 1.0.9 licenses = ['APACHE-2.0'] // or something else -groovyVersion = 3.0.8 +groovyVersion = 3.0.9 slf4jVersion = 1.7.32 spockVersion = 2.0-groovy-3.0 siteUrl = https://bitbucket.org/mnellemann/libcvrapi diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ef9a9e0..84d1f85 100644 --- 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-5.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists