From d7bb06bfcb5c7d4432d67fc663f0807236780cf0 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 11 May 2021 20:39:13 -0700 Subject: [PATCH] Upgraded to Gradle 7.0.1 --- build.gradle.kts | 7 ++++++- examples/build.gradle.kts | 4 ++-- examples/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6ba189b..53aff64 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.net.URL +import org.gradle.api.tasks.testing.logging.TestExceptionFormat plugins { jacoco @@ -90,6 +91,10 @@ val javadocJar by tasks.creating(Jar::class) { tasks { withType { + testLogging { + exceptionFormat = TestExceptionFormat.FULL + } + useTestNG() } @@ -226,7 +231,7 @@ publishing { scm { connection.set("scm:git:git://github.com/$gitHub.git") developerConnection.set("scm:git:git@github.com:$gitHub.git") - url.set("$mavenUrl") + url.set(mavenUrl) } issueManagement { system.set("GitHub") diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index c573336..a975d8c 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -20,13 +20,13 @@ dependencies { } application { - mainClassName = "com.example.AkismetExampleKt" + mainClass.set("com.example.AkismetExampleKt") } tasks { register("runJava", JavaExec::class) { group = "application" main = "com.example.AkismetSample" - classpath = sourceSets["main"].runtimeClasspath + classpath = sourceSets.main.get().runtimeClasspath } } diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index f371643..e5338d3 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643..e5338d3 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-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists