From ebc945badc6836bbef64840ae7a20230788a90f4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 20 Dec 2018 11:44:41 -0800 Subject: [PATCH] Dependencies and syntax updates. --- .idea/modules.xml | 2 + .idea/modules/ap-examples-java.iml | 2 +- .idea/modules/ap-examples-java_main.iml | 14 + .idea/modules/ap-examples-java_test.iml | 14 + .idea/modules/ap-examples-kotlin.iml | 2 +- .idea/modules/ap-examples-kotlin_main.iml | 17 +- .idea/modules/ap-examples-kotlin_test.iml | 17 +- .idea/modules/examples-java.iml | 2 +- .idea/modules/examples-java_main.iml | 2 +- .idea/modules/examples-java_test.iml | 10 +- .idea/modules/examples-kotlin.iml | 2 +- .idea/modules/examples-kotlin_main.iml | 12 +- .idea/modules/examples-kotlin_test.iml | 18 +- .idea/modules/semver_main.iml | 240 +++++++------- .idea/modules/semver_test.iml | 299 +++++++++--------- build.gradle.kts | 10 +- .../annotation-processor/java/build.gradle | 2 +- .../java/com/example/GeneratedVersion.java | 2 +- .../java/version.properties | 2 +- .../kotlin/build.gradle.kts | 8 +- .../kotlin/version.properties | 2 +- examples/java/build.gradle | 10 +- examples/java/version.properties | 2 +- examples/kotlin/build.gradle.kts | 8 +- 24 files changed, 367 insertions(+), 332 deletions(-) create mode 100644 .idea/modules/ap-examples-java_main.iml create mode 100644 .idea/modules/ap-examples-java_test.iml diff --git a/.idea/modules.xml b/.idea/modules.xml index 4bdf5a1..75b2526 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,8 @@ + + diff --git a/.idea/modules/ap-examples-java.iml b/.idea/modules/ap-examples-java.iml index 4667d8e..81f7f8a 100644 --- a/.idea/modules/ap-examples-java.iml +++ b/.idea/modules/ap-examples-java.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/ap-examples-java_main.iml b/.idea/modules/ap-examples-java_main.iml new file mode 100644 index 0000000..820a289 --- /dev/null +++ b/.idea/modules/ap-examples-java_main.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/ap-examples-java_test.iml b/.idea/modules/ap-examples-java_test.iml new file mode 100644 index 0000000..671e6c0 --- /dev/null +++ b/.idea/modules/ap-examples-java_test.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/ap-examples-kotlin.iml b/.idea/modules/ap-examples-kotlin.iml index 33067fd..e50ce53 100644 --- a/.idea/modules/ap-examples-kotlin.iml +++ b/.idea/modules/ap-examples-kotlin.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/ap-examples-kotlin_main.iml b/.idea/modules/ap-examples-kotlin_main.iml index ec84d97..18f28d7 100644 --- a/.idea/modules/ap-examples-kotlin_main.iml +++ b/.idea/modules/ap-examples-kotlin_main.iml @@ -1,25 +1,18 @@ - + - - @@ -38,7 +31,6 @@ - @@ -48,7 +40,8 @@ - + + diff --git a/.idea/modules/ap-examples-kotlin_test.iml b/.idea/modules/ap-examples-kotlin_test.iml index 2e17efb..8a476dc 100644 --- a/.idea/modules/ap-examples-kotlin_test.iml +++ b/.idea/modules/ap-examples-kotlin_test.iml @@ -1,25 +1,18 @@ - + - - @@ -46,8 +39,8 @@ - - + + diff --git a/.idea/modules/examples-java.iml b/.idea/modules/examples-java.iml index 6260c53..398cc36 100644 --- a/.idea/modules/examples-java.iml +++ b/.idea/modules/examples-java.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/examples-java_main.iml b/.idea/modules/examples-java_main.iml index 64bd9c4..c86e055 100644 --- a/.idea/modules/examples-java_main.iml +++ b/.idea/modules/examples-java_main.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/examples-java_test.iml b/.idea/modules/examples-java_test.iml index 01be4f7..8ce836f 100644 --- a/.idea/modules/examples-java_test.iml +++ b/.idea/modules/examples-java_test.iml @@ -1,5 +1,5 @@ - + @@ -8,13 +8,7 @@ - - - - - - - + \ No newline at end of file diff --git a/.idea/modules/examples-kotlin.iml b/.idea/modules/examples-kotlin.iml index a1db27c..311f2b4 100644 --- a/.idea/modules/examples-kotlin.iml +++ b/.idea/modules/examples-kotlin.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/examples-kotlin_main.iml b/.idea/modules/examples-kotlin_main.iml index cf49b10..386f187 100644 --- a/.idea/modules/examples-kotlin_main.iml +++ b/.idea/modules/examples-kotlin_main.iml @@ -1,25 +1,25 @@ - + - @@ -32,8 +32,8 @@ - - + + \ No newline at end of file diff --git a/.idea/modules/examples-kotlin_test.iml b/.idea/modules/examples-kotlin_test.iml index 0abc128..f1becdd 100644 --- a/.idea/modules/examples-kotlin_test.iml +++ b/.idea/modules/examples-kotlin_test.iml @@ -1,25 +1,31 @@ - + + - @@ -33,9 +39,9 @@ - + - + diff --git a/.idea/modules/semver_main.iml b/.idea/modules/semver_main.iml index b736ad2..17c1b11 100644 --- a/.idea/modules/semver_main.iml +++ b/.idea/modules/semver_main.iml @@ -4,17 +4,18 @@ - - @@ -34,6 +39,9 @@ + + + @@ -42,18 +50,16 @@ - + - - - + - + - + @@ -62,18 +68,7 @@ - - - - - - - - - - - - + @@ -82,7 +77,82 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -104,6 +174,7 @@ + @@ -147,6 +218,7 @@ + @@ -164,16 +236,7 @@ - - - - - - - - - - + @@ -184,7 +247,7 @@ - + @@ -193,7 +256,29 @@ - + + + + + + + + + + + + + + + + + + + + + + + @@ -202,7 +287,7 @@ - + @@ -211,7 +296,7 @@ - + @@ -220,66 +305,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -288,29 +314,13 @@ - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml index e5a3860..35a2d68 100644 --- a/.idea/modules/semver_test.iml +++ b/.idea/modules/semver_test.iml @@ -8,13 +8,20 @@ + - @@ -43,7 +54,133 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,6 +202,7 @@ + @@ -108,6 +246,7 @@ + @@ -125,101 +264,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -230,63 +275,31 @@ - + - + + + - - - - - + - + - + + + - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 8f95ea5..4cf9e12 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,10 +4,10 @@ plugins { `kotlin-dsl` `java-gradle-plugin` `maven-publish` - id("com.gradle.plugin-publish") version "0.10.0" - id("com.github.ben-manes.versions") version "0.20.0" - id("org.jlleitschuh.gradle.ktlint") version "6.3.1" - id("io.gitlab.arturbosch.detekt") version "1.0.0-RC11" + id("com.gradle.plugin-publish").version("0.10.0") + id("com.github.ben-manes.versions").version("0.20.0") + id("org.jlleitschuh.gradle.ktlint").version("6.3.1") + id("io.gitlab.arturbosch.detekt").version("1.0.0-RC12") } version = "0.9.8-beta" @@ -23,7 +23,7 @@ repositories { } dependencies { - compile(gradleApi()) + implementation(gradleApi()) testImplementation(kotlin("reflect")) testImplementation(kotlin("test")) diff --git a/examples/annotation-processor/java/build.gradle b/examples/annotation-processor/java/build.gradle index 96e08d3..c65e6e7 100644 --- a/examples/annotation-processor/java/build.gradle +++ b/examples/annotation-processor/java/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'application' - id "net.thauvin.erik.gradle.semver" version "0.9.8-beta" + id 'net.thauvin.erik.gradle.semver' version '0.9.8-beta' } // ./gradlew 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 24315b7..589da2d 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 @@ -16,7 +16,7 @@ public final class GeneratedVersion { public final static String BUILDMETA_PREFIX = "+"; public final static String PROJECT = ""; - public final static Date BUILDDATE = new Date(1531208748879L); + public final static Date BUILDDATE = new Date(1543552509400L); public final static int MAJOR = 2; public final static int MINOR = 1; public final static int PATCH = 2; diff --git a/examples/annotation-processor/java/version.properties b/examples/annotation-processor/java/version.properties index d12ed01..a098b00 100644 --- a/examples/annotation-processor/java/version.properties +++ b/examples/annotation-processor/java/version.properties @@ -1,5 +1,5 @@ #Generated by the Semver Plugin for Gradle -#Tue Nov 27 19:16:37 PST 2018 +#Thu Nov 29 20:38:43 PST 2018 version.buildmeta= version.major=2 version.minor=1 diff --git a/examples/annotation-processor/kotlin/build.gradle.kts b/examples/annotation-processor/kotlin/build.gradle.kts index 8c4f694..a6d85aa 100644 --- a/examples/annotation-processor/kotlin/build.gradle.kts +++ b/examples/annotation-processor/kotlin/build.gradle.kts @@ -1,8 +1,8 @@ plugins { - kotlin("jvm") version "1.3.0" + kotlin("jvm").version("1.3.0") application - id("org.jetbrains.kotlin.kapt") version "1.3.0" - id("net.thauvin.erik.gradle.semver") version "0.9.8-beta" + id("org.jetbrains.kotlin.kapt").version("1.3.0") + id("net.thauvin.erik.gradle.semver").version("0.9.8-beta") } // ./gradlew @@ -18,7 +18,7 @@ dependencies { kapt(semverProcessor) compileOnly(semverProcessor) - compile(kotlin("stdlib")) + implementation(kotlin("stdlib")) } repositories { diff --git a/examples/annotation-processor/kotlin/version.properties b/examples/annotation-processor/kotlin/version.properties index 4cc614d..e83411b 100644 --- a/examples/annotation-processor/kotlin/version.properties +++ b/examples/annotation-processor/kotlin/version.properties @@ -1,5 +1,5 @@ #Generated by the Semver Plugin for Gradle -#Tue Nov 27 19:16:46 PST 2018 +#Thu Nov 29 20:35:47 PST 2018 version.buildmeta= version.major=11 version.minor=2 diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 7da6bd1..2fbb520 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'application' - id "net.thauvin.erik.gradle.semver" version "0.9.8-beta" + id 'net.thauvin.erik.gradle.semver' version '0.9.8-beta' } // ./gradlew @@ -15,12 +15,8 @@ mainClassName = 'App' defaultTasks 'run' dependencies { - testImplementation( - 'org.junit.jupiter:junit-jupiter-api:5.2.0' - ) - testRuntimeOnly( - 'org.junit.jupiter:junit-jupiter-engine:5.2.0' - ) + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2' } repositories { diff --git a/examples/java/version.properties b/examples/java/version.properties index f5a9283..00dcbb0 100644 --- a/examples/java/version.properties +++ b/examples/java/version.properties @@ -1,5 +1,5 @@ #Generated by the Semver Plugin for Gradle -#Tue Nov 27 19:16:10 PST 2018 +#Thu Nov 29 20:33:16 PST 2018 version.buildmeta=20180713152249 version.major=1 version.minor=1 diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index 2739fbc..1a6b28d 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -4,9 +4,9 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter plugins { - kotlin("jvm") version "1.3.0" + kotlin("jvm").version("1.3.0") application - id("net.thauvin.erik.gradle.semver") version "0.9.8-beta" + id("net.thauvin.erik.gradle.semver").version("0.9.8-beta") } // ./gradlew @@ -18,8 +18,8 @@ plugins { defaultTasks(ApplicationPlugin.TASK_RUN_NAME) dependencies { - compile(kotlin("stdlib")) - testCompile("org.testng:testng:6.14.3") + implementation(kotlin("stdlib")) + testImplementation("org.testng:testng:6.14.3") } repositories {