From 884cb690393186a61a0fce0a11265c23c7e92230 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 30 Jun 2018 01:15:29 -0700 Subject: [PATCH] Added ktlint checks. --- .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/modules/semver_main.iml | 367 +++++++++++------- .idea/modules/semver_test.iml | 288 ++++++++++---- .idea/vcs.xml | 6 + build.gradle.kts | 35 +- .../erik/gradle/semver/SemverIncrementTask.kt | 1 - .../erik/gradle/semver/SemverPlugin.kt | 2 +- 7 files changed, 468 insertions(+), 236 deletions(-) create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/vcs.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/.idea/modules/semver_main.iml b/.idea/modules/semver_main.iml index 63d2ae9..e6ba4e2 100644 --- a/.idea/modules/semver_main.iml +++ b/.idea/modules/semver_main.iml @@ -39,34 +39,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -78,111 +51,81 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -192,12 +135,22 @@ - - - + - + + + + + + + + + + + + + @@ -206,7 +159,151 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml index bae2277..4269407 100644 --- a/.idea/modules/semver_test.iml +++ b/.idea/modules/semver_test.iml @@ -39,21 +39,84 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -66,61 +129,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -135,17 +144,8 @@ - - - - - - - - - - + @@ -155,20 +155,144 @@ - + - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index d7147d4..d14f2e1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,15 +6,14 @@ plugins { `maven-publish` id("com.gradle.plugin-publish") version "0.9.10" id("com.github.ben-manes.versions") version "0.20.0" + id("org.jmailen.kotlinter") version "1.14.0" } -var shortName = "server" -var github = "https://github.com/ethauvin/gradle-semver-plugin" -var packageName = "net.thauvin.erik.gradle.semver" - version = "0.9.1" group = "net.thauvin.erik.gradle" +var github = "https://github.com/ethauvin/semver-gradle" +var packageName = "net.thauvin.erik.gradle.semver" var spekVersion = "1.1.5" @@ -27,6 +26,7 @@ dependencies { testImplementation(kotlin("reflect")) testImplementation(kotlin("test")) + testImplementation(gradleTestKit()) testImplementation("org.jetbrains.spek:spek-api:$spekVersion") { exclude(group = "org.jetbrains.kotlin") @@ -40,18 +40,19 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.2.0") { because("Needed to run tests IDEs that bundle an older version") } - testImplementation(gradleTestKit()) } -tasks.withType { - kotlinOptions.jvmTarget = "1.8" - // Gradle 4.6 - kotlinOptions.apiVersion = "1.2" -} +tasks { + withType { + kotlinOptions.jvmTarget = "1.8" + // Gradle 4.6 + kotlinOptions.apiVersion = "1.2" + } -tasks.withType { - useJUnitPlatform { - includeEngines("spek") + withType { + useJUnitPlatform { + includeEngines("spek") + } } } @@ -67,13 +68,13 @@ gradlePlugin { pluginBundle { website = github vcsUrl = github - description = "Gradle plugin to automatically manage Semantic Version numbering." - tags = listOf("semver", "version", "versioning") + description = "Semantic Version Plugin for Gradle" + tags = listOf("semver", "semantic", "version", "versioning", "auto-increment", "kotlin", "java") (plugins) { project.name { id = packageName - displayName = "Gradle Semamtic Version Plugin" + displayName = project.name } } @@ -81,4 +82,4 @@ pluginBundle { groupId = project.group.toString() artifactId = project.name } -} +} \ No newline at end of file diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementTask.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementTask.kt index 3a579b0..a6e676d 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementTask.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverIncrementTask.kt @@ -58,5 +58,4 @@ open class SemverIncrementTask : DefaultTask() { logger.warn("Version: ${project.version}") SemverPlugin.saveProperties(config, version) } - } \ No newline at end of file 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 31dbffb..cf1143d 100644 --- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt +++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt @@ -37,7 +37,7 @@ import org.gradle.api.Project import java.io.File import java.io.FileInputStream import java.io.FileOutputStream -import java.util.* +import java.util.Properties class SemverPlugin : Plugin { private var version = Version()