From 17b5ceaaf6de3145b43539ed98b609609ce965a8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 25 Jul 2019 01:46:05 -0700 Subject: [PATCH] Updated dependencies. --- .idea/codeStyles/codeStyleConfig.xml | 5 ++++ build.gradle.kts | 30 ++++++++++++++----- .../java/com/example/GeneratedVersion.java | 23 +++++++------- .../java/version.properties | 6 ++-- .../kotlin/build.gradle.kts | 4 +-- .../kotlin/version.properties | 6 ++-- examples/java/build.gradle | 4 +-- examples/java/version.properties | 6 ++-- examples/kotlin/build.gradle.kts | 2 +- examples/kotlin/version.properties | 6 ++-- 10 files changed, 56 insertions(+), 36 deletions(-) create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..d91f848 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 96dc80f..e8cea4e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,18 +8,22 @@ plugins { id("com.github.ben-manes.versions") version "0.21.0" id("com.gradle.build-scan") version "2.3" id("com.gradle.plugin-publish") version "0.10.1" - id("io.gitlab.arturbosch.detekt") version "1.0.0-RC14" - id("org.jmailen.kotlinter") version "1.25.2" + id("io.gitlab.arturbosch.detekt") version "1.0.0-RC14" // don't update until kotlin 1.3.401 is supported by Gradle + id("org.jmailen.kotlinter") version "1.26.0" // don't update until kotlin 1.3.41 supported by Gradle id("org.sonarqube") version "2.7.1" + kotlin("jvm") version "1.3.31" } -version = "1.0.2" +version = "1.0.3-beta" group = "net.thauvin.erik.gradle" var github = "https://github.com/ethauvin/semver-gradle" var packageName = "net.thauvin.erik.gradle.semver" -var spek_version = "2.0.5" +object Versions { + const val kotlin = "1.3.31" + const val spek = "2.0.5" +} repositories { jcenter() @@ -28,12 +32,13 @@ repositories { dependencies { implementation(gradleApi()) - testImplementation(kotlin("reflect")) - testImplementation(kotlin("test")) + testImplementation(kotlin("reflect", version = Versions.kotlin)) + testImplementation(kotlin("test", version = Versions.kotlin)) testImplementation(gradleTestKit()) - testImplementation("org.spekframework.spek2:spek-dsl-jvm:$spek_version") - testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:$spek_version") + testImplementation("org.spekframework.spek2:spek-dsl-jvm:${Versions.spek}") + testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:${Versions.spek}") + implementation(kotlin("stdlib-jdk8", version = Versions.kotlin)) } tasks { @@ -81,6 +86,7 @@ kotlinter { ignoreFailures = false reporters = arrayOf("html") experimentalRules = false + //disabledRules = arrayOf("import-ordering") } sonarqube { @@ -111,3 +117,11 @@ pluginBundle { artifactId = project.name } } +val compileKotlin: KotlinCompile by tasks +compileKotlin.kotlinOptions { + jvmTarget = "1.8" +} +val compileTestKotlin: KotlinCompile by tasks +compileTestKotlin.kotlinOptions { + jvmTarget = "1.8" +} 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 19aa5c6..5010897 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 @@ -2,6 +2,7 @@ * This file is automatically generated. * Do not modify! -- ALL CHANGES WILL BE ERASED! */ + package com.example; import java.util.Date; @@ -12,17 +13,17 @@ import java.util.Date; * @author Semantic Version Annotation Processor */ public final class GeneratedVersion { - public final static String PROJECT = "Java Example"; - public final static Date BUILDDATE = new Date(1556062927242L); - public final static int MAJOR = 2; - public final static int MINOR = 9; - public final static int PATCH = 0; - public final static String PRERELEASE = ""; - public final static String PRERELEASE_PREFIX = "-"; - public final static String BUILDMETA = ""; - public final static String BUILDMETA_PREFIX = "+"; - public final static String SEPARATOR = "."; - public final static String VERSION = "2.9.0"; + public static final String PROJECT = "Java Example"; + public static final Date BUILDDATE = new Date(1564027571537L); + public static final int MAJOR = 2; + public static final int MINOR = 10; + public static final int PATCH = 0; + public static final String PRERELEASE = ""; + public static final String PRERELEASE_PREFIX = "-"; + public static final String BUILDMETA = ""; + public static final String BUILDMETA_PREFIX = "+"; + public static final String SEPARATOR = "."; + public static final String VERSION = "2.10.0"; /** * Disables the default constructor. diff --git a/examples/annotation-processor/java/version.properties b/examples/annotation-processor/java/version.properties index 29ed47a..fc54733 100644 --- a/examples/annotation-processor/java/version.properties +++ b/examples/annotation-processor/java/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Tue Apr 23 16:42:04 PDT 2019 +#Wed Jul 24 21:06:09 PDT 2019 version.buildmeta= version.major=2 -version.minor=9 +version.minor=10 version.patch=0 version.prerelease= version.project=Java Example -version.semver=2.9.0 +version.semver=2.10.0 diff --git a/examples/annotation-processor/kotlin/build.gradle.kts b/examples/annotation-processor/kotlin/build.gradle.kts index 697698d..570b231 100644 --- a/examples/annotation-processor/kotlin/build.gradle.kts +++ b/examples/annotation-processor/kotlin/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - kotlin("jvm").version("1.3.30") + kotlin("jvm").version("1.3.41") application - id("org.jetbrains.kotlin.kapt").version("1.3.31") + id("org.jetbrains.kotlin.kapt").version("1.3.41") id("net.thauvin.erik.gradle.semver").version("1.0.2") id("com.github.ben-manes.versions").version("0.21.0") } diff --git a/examples/annotation-processor/kotlin/version.properties b/examples/annotation-processor/kotlin/version.properties index 0c32b5e..8da5e3a 100644 --- a/examples/annotation-processor/kotlin/version.properties +++ b/examples/annotation-processor/kotlin/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Tue Apr 23 16:42:52 PDT 2019 +#Wed Jul 24 21:06:46 PDT 2019 version.buildmeta= version.major=14 -version.minor=2 +version.minor=3 version.patch=0 version.prerelease= version.project=Kotlin Example -version.semver=14.2.0 +version.semver=14.3.0 diff --git a/examples/java/build.gradle b/examples/java/build.gradle index ed227c2..10233fe 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -16,8 +16,8 @@ mainClassName = 'App' defaultTasks 'run' dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.0-M1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.0-M1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' } repositories { diff --git a/examples/java/version.properties b/examples/java/version.properties index 3bd47e1..946ba36 100644 --- a/examples/java/version.properties +++ b/examples/java/version.properties @@ -1,8 +1,8 @@ #Generated by the Semver Plugin for Gradle -#Fri May 24 07:51:21 PDT 2019 -version.buildmeta= +#Wed Jul 24 21:04:08 PDT 2019 +version.buildmeta=20190724210408 version.major=1 version.minor=0 version.patch=0 version.prerelease= -version.semver=1.0.0 +version.semver=1.0.0+20190724210408 diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index 7c94bc8..58be385 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -4,7 +4,7 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter plugins { - kotlin("jvm").version("1.3.31") + kotlin("jvm").version("1.3.41") application id("net.thauvin.erik.gradle.semver").version("1.0.2") id("com.github.ben-manes.versions").version("0.21.0") diff --git a/examples/kotlin/version.properties b/examples/kotlin/version.properties index 42b96ca..568c94e 100644 --- a/examples/kotlin/version.properties +++ b/examples/kotlin/version.properties @@ -1,8 +1,8 @@ #Generated by the Semver Plugin for Gradle -#Fri May 24 01:12:52 PDT 2019 -version.buildmeta=20190524011252 +#Wed Jul 24 21:05:40 PDT 2019 +version.buildmeta=20190724210540 version.major=1 version.minor=2 version.patch=4 version.prerelease=beta -version.semver=1.2.4-beta+20190524011252 +version.semver=1.2.4-beta+20190724210540