From d1be1384008b58dd24d7b71d6b6e072b730325be Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 13 Jul 2018 23:55:56 -0700 Subject: [PATCH] Version 0.9.8-beta --- build.gradle.kts | 2 +- detekt-baseline.xml | 4 +++- examples/annotation-processor/java/build.gradle | 2 +- examples/annotation-processor/kotlin/build.gradle.kts | 2 +- examples/java/build.gradle | 2 +- examples/kotlin/build.gradle.kts | 2 +- examples/test/build.gradle | 2 +- .../kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt | 8 ++++---- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9681233..1dd2159 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("io.gitlab.arturbosch.detekt") version "1.0.0.RC7" } -version = "0.9.7-beta" +version = "0.9.8-beta" group = "net.thauvin.erik.gradle" var github = "https://github.com/ethauvin/semver-gradle" diff --git a/detekt-baseline.xml b/detekt-baseline.xml index e9d3cfb..54c1b9d 100644 --- a/detekt-baseline.xml +++ b/detekt-baseline.xml @@ -1,8 +1,10 @@ - + + ComplexMethod:SemverPlugin.kt$SemverPlugin.Companion$fun saveProperties(config: SemverConfig, version: Version) MaxLineLength:SemverPlugin.kt$net.thauvin.erik.gradle.semver.SemverPlugin.kt NestedBlockDepth:SemverPlugin.kt$SemverPlugin$private fun afterEvaluate(project: Project) + NestedBlockDepth:SemverPlugin.kt$SemverPlugin.Companion$fun saveProperties(config: SemverConfig, version: Version) \ No newline at end of file diff --git a/examples/annotation-processor/java/build.gradle b/examples/annotation-processor/java/build.gradle index 5658c07..96e08d3 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.7-beta" + id "net.thauvin.erik.gradle.semver" version "0.9.8-beta" } // ./gradlew diff --git a/examples/annotation-processor/kotlin/build.gradle.kts b/examples/annotation-processor/kotlin/build.gradle.kts index 35d413f..e6816c5 100644 --- a/examples/annotation-processor/kotlin/build.gradle.kts +++ b/examples/annotation-processor/kotlin/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin("jvm") version "1.2.50" application id("org.jetbrains.kotlin.kapt") version "1.2.50" - id("net.thauvin.erik.gradle.semver") version "0.9.7-beta" + id("net.thauvin.erik.gradle.semver") version "0.9.8-beta" } // ./gradlew diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 154185d..7da6bd1 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.7-beta" + id "net.thauvin.erik.gradle.semver" version "0.9.8-beta" } // ./gradlew diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index 0991017..5684c07 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -7,7 +7,7 @@ import java.time.format.DateTimeFormatter plugins { kotlin("jvm") version "1.2.50" application - id("net.thauvin.erik.gradle.semver") version "0.9.7-beta" + id("net.thauvin.erik.gradle.semver") version "0.9.8-beta" } // ./gradlew diff --git a/examples/test/build.gradle b/examples/test/build.gradle index bb3705f..a1034fc 100644 --- a/examples/test/build.gradle +++ b/examples/test/build.gradle @@ -8,7 +8,7 @@ buildscript { mavenLocal() } dependencies { - classpath "net.thauvin.erik.gradle:semver:0.9.7-beta" + classpath "net.thauvin.erik.gradle:semver:0.9.8-beta" } } diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt index a0341e5..987d122 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt @@ -60,11 +60,11 @@ class SemverPlugin : Plugin { put(config.patchKey, version.patch) put(config.preReleaseKey, version.preRelease) put(config.buildMetaKey, version.buildMeta) - if (version.buildMetaPrefix != Version.DEFAULT_BUILDMETA_PREFIX - || containsKey(config.buildMetaPrefixKey)) + if (version.buildMetaPrefix != Version.DEFAULT_BUILDMETA_PREFIX || + containsKey(config.buildMetaPrefixKey)) put(config.buildMetaPrefixKey, version.buildMetaPrefix) - if (version.preReleasePrefix != Version.DEFAULT_PRERELEASE_PREFIX - || containsKey(config.preReleasePrefixKey)) + if (version.preReleasePrefix != Version.DEFAULT_PRERELEASE_PREFIX || + containsKey(config.preReleasePrefixKey)) put(config.preReleasePrefixKey, version.preReleasePrefix) if (version.separator != Version.DEFAULT_SEPARATOR || containsKey(config.separatorKey)) put(config.separatorKey, version.separator)