From f4b1caa98658ff54b863b85eb35e464af9c601e3 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 11 May 2021 20:57:34 -0700 Subject: [PATCH] Upgraded to Gradle 7.0.1 --- build.gradle.kts | 15 +++++++++++---- examples/annotation-processor/java/build.gradle | 1 + .../java/gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/com/example/GeneratedVersion.java | 2 +- .../annotation-processor/kotlin/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/gradle/wrapper/gradle-wrapper.properties | 2 +- examples/kotlin/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6fa72e3..f77d8e8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import org.gradle.api.tasks.testing.logging.TestExceptionFormat plugins { + java `java-gradle-plugin` `maven-publish` jacoco - kotlin("jvm") version "1.4.31" + kotlin("jvm") version "1.4.31" // Don't upgrade until kotlin-dsl plugin is upgraded. id("com.github.ben-manes.versions") version "0.38.0" id("com.gradle.plugin-publish") version "0.14.0" id("io.gitlab.arturbosch.detekt") version "1.16.0" @@ -16,7 +18,7 @@ version = "1.0.5" group = "net.thauvin.erik.gradle" object VersionInfo { - const val spek = "2.0.15" + const val spek = "2.0.15" // Don't upgrade until 2.0.17 } val versions: VersionInfo by extra { VersionInfo } @@ -33,10 +35,11 @@ dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom")) implementation(kotlin("stdlib")) + testImplementation(kotlin("reflect")) testImplementation(kotlin("test")) - testImplementation(gradleTestKit()) + //testImplementation(gradleTestKit()) testImplementation("org.spekframework.spek2:spek-dsl-jvm:${versions.spek}") testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:${versions.spek}") @@ -50,13 +53,17 @@ tasks { } withType { + testLogging { + exceptionFormat = TestExceptionFormat.FULL + } + useJUnitPlatform { includeEngines("spek2") } } jacoco { - toolVersion = "0.8.7-SNAPSHOT" + toolVersion = "0.8.7" } jacocoTestReport { diff --git a/examples/annotation-processor/java/build.gradle b/examples/annotation-processor/java/build.gradle index a7e7b7a..3ee708e 100644 --- a/examples/annotation-processor/java/build.gradle +++ b/examples/annotation-processor/java/build.gradle @@ -28,6 +28,7 @@ tasks.withType(JavaCompile) { repositories { mavenLocal() + mavenCentral() } run { diff --git a/examples/annotation-processor/java/gradle/wrapper/gradle-wrapper.properties b/examples/annotation-processor/java/gradle/wrapper/gradle-wrapper.properties index f371643..e5338d3 100644 --- a/examples/annotation-processor/java/gradle/wrapper/gradle-wrapper.properties +++ b/examples/annotation-processor/java/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/examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java b/examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java index 29eb2ac..1620dcb 100644 --- a/examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java +++ b/examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java @@ -14,7 +14,7 @@ import java.util.Date; */ public final class GeneratedVersion { public static final String PROJECT = "Java Example"; - public static final Date BUILDDATE = new Date(1619649806553L); + public static final Date BUILDDATE = new Date(1620791725025L); public static final int MAJOR = 2; public static final int MINOR = 10; public static final int PATCH = 0; diff --git a/examples/annotation-processor/kotlin/build.gradle.kts b/examples/annotation-processor/kotlin/build.gradle.kts index 8b03755..73b450c 100644 --- a/examples/annotation-processor/kotlin/build.gradle.kts +++ b/examples/annotation-processor/kotlin/build.gradle.kts @@ -28,7 +28,7 @@ repositories { } application { - mainClassName = "com.example.Main" + mainClass.set("com.example.Main") } kapt { diff --git a/examples/annotation-processor/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/annotation-processor/kotlin/gradle/wrapper/gradle-wrapper.properties index f371643..e5338d3 100644 --- a/examples/annotation-processor/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/annotation-processor/kotlin/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/examples/java/gradle/wrapper/gradle-wrapper.properties b/examples/java/gradle/wrapper/gradle-wrapper.properties index f371643..e5338d3 100644 --- a/examples/java/gradle/wrapper/gradle-wrapper.properties +++ b/examples/java/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/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index 3ec369e..34825ae 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -28,7 +28,7 @@ repositories { } application { - mainClassName = "com.example.MainKt" + mainClass.set("com.example.MainKt") // project.afterEvaluate { // println("Version: $version") // } diff --git a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties index f371643..e5338d3 100644 --- a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/kotlin/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