From ab85a041138a839f2519e4a058fb642ca7ce6290 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 1 Nov 2018 19:07:17 -0700 Subject: [PATCH] Kotlin-dsl syntax updates. --- build.gradle.kts | 2 +- examples/annotation-processor/kotlin/build.gradle.kts | 4 +--- examples/kotlin/build.gradle.kts | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9e013a1..2e6ee05 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,7 +56,7 @@ tasks { } } - val check by getting { + "check" { dependsOn("ktlintCheck") } } diff --git a/examples/annotation-processor/kotlin/build.gradle.kts b/examples/annotation-processor/kotlin/build.gradle.kts index e6816c5..9da3401 100644 --- a/examples/annotation-processor/kotlin/build.gradle.kts +++ b/examples/annotation-processor/kotlin/build.gradle.kts @@ -1,5 +1,3 @@ -import net.thauvin.erik.gradle.semver.SemverConfig - plugins { kotlin("jvm") version "1.2.50" application @@ -32,7 +30,7 @@ application { mainClassName = "com.example.Main" } -configure { +semver { // properties = "example.properties" // keysPrefix = "example." // preReleaseKey = "release" diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index 5684c07..9316591 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -1,4 +1,3 @@ -import net.thauvin.erik.gradle.semver.SemverConfig import net.thauvin.erik.gradle.semver.SemverIncrementBuildMetaTask import java.lang.String.format import java.time.LocalDateTime @@ -31,7 +30,7 @@ application { mainClassName = "com.example.MainKt" } -configure { +semver { // properties = "example.properties" // keysPrefix = "example." // preReleaseKey = "release" @@ -43,14 +42,14 @@ tasks { useTestNG() } - val incrementBuildMeta by getting(SemverIncrementBuildMetaTask::class) { + "incrementBuildMeta"(SemverIncrementBuildMetaTask::class) { doFirst { // buildMeta = format("%03d", buildMeta.toInt() + 1) buildMeta = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) } } - val run by getting(JavaExec::class) { + "run"(JavaExec::class) { doFirst { println("Version: $version") }