Added ktlint checks.

This commit is contained in:
Erik C. Thauvin 2018-06-30 01:15:29 -07:00
parent a4869e9b04
commit 884cb69039
7 changed files with 468 additions and 236 deletions

5
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View file

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" />
</state>
</component>

View file

@ -39,34 +39,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-api-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-reflect-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/groovy-all-2.4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -78,111 +51,81 @@
<root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-api-4.8.1.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-api-4.8.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES>
<root url="file://C:/gradle/src/announce" />
<root url="file://C:/gradle/src/antlr" />
<root url="file://C:/gradle/src/base-services" />
<root url="file://C:/gradle/src/base-services-groovy" />
<root url="file://C:/gradle/src/build-cache" />
<root url="file://C:/gradle/src/build-cache-http" />
<root url="file://C:/gradle/src/build-comparison" />
<root url="file://C:/gradle/src/build-init" />
<root url="file://C:/gradle/src/build-option" />
<root url="file://C:/gradle/src/cli" />
<root url="file://C:/gradle/src/code-quality" />
<root url="file://C:/gradle/src/composite-builds" />
<root url="file://C:/gradle/src/core" />
<root url="file://C:/gradle/src/core-api" />
<root url="file://C:/gradle/src/dependency-management" />
<root url="file://C:/gradle/src/diagnostics" />
<root url="file://C:/gradle/src/ear" />
<root url="file://C:/gradle/src/ide" />
<root url="file://C:/gradle/src/ide-native" />
<root url="file://C:/gradle/src/ide-play" />
<root url="file://C:/gradle/src/installation-beacon" />
<root url="file://C:/gradle/src/internal-android-performance-testing" />
<root url="file://C:/gradle/src/internal-integ-testing" />
<root url="file://C:/gradle/src/internal-performance-testing" />
<root url="file://C:/gradle/src/internal-testing" />
<root url="file://C:/gradle/src/ivy" />
<root url="file://C:/gradle/src/jacoco" />
<root url="file://C:/gradle/src/javascript" />
<root url="file://C:/gradle/src/jvm-services" />
<root url="file://C:/gradle/src/language-groovy" />
<root url="file://C:/gradle/src/language-java" />
<root url="file://C:/gradle/src/language-jvm" />
<root url="file://C:/gradle/src/language-native" />
<root url="file://C:/gradle/src/language-scala" />
<root url="file://C:/gradle/src/launcher" />
<root url="file://C:/gradle/src/logging" />
<root url="file://C:/gradle/src/maven" />
<root url="file://C:/gradle/src/messaging" />
<root url="file://C:/gradle/src/model-core" />
<root url="file://C:/gradle/src/model-groovy" />
<root url="file://C:/gradle/src/native" />
<root url="file://C:/gradle/src/osgi" />
<root url="file://C:/gradle/src/persistent-cache" />
<root url="file://C:/gradle/src/platform-base" />
<root url="file://C:/gradle/src/platform-jvm" />
<root url="file://C:/gradle/src/platform-native" />
<root url="file://C:/gradle/src/platform-play" />
<root url="file://C:/gradle/src/plugin-development" />
<root url="file://C:/gradle/src/plugin-use" />
<root url="file://C:/gradle/src/plugins" />
<root url="file://C:/gradle/src/process-services" />
<root url="file://C:/gradle/src/publish" />
<root url="file://C:/gradle/src/reporting" />
<root url="file://C:/gradle/src/resources" />
<root url="file://C:/gradle/src/resources-gcs" />
<root url="file://C:/gradle/src/resources-http" />
<root url="file://C:/gradle/src/resources-s3" />
<root url="file://C:/gradle/src/resources-sftp" />
<root url="file://C:/gradle/src/scala" />
<root url="file://C:/gradle/src/signing" />
<root url="file://C:/gradle/src/test-kit" />
<root url="file://C:/gradle/src/testing-base" />
<root url="file://C:/gradle/src/testing-junit-platform" />
<root url="file://C:/gradle/src/testing-jvm" />
<root url="file://C:/gradle/src/testing-native" />
<root url="file://C:/gradle/src/tooling-api" />
<root url="file://C:/gradle/src/tooling-api-builders" />
<root url="file://C:/gradle/src/version-control" />
<root url="file://C:/gradle/src/workers" />
<root url="file://C:/gradle/src/wrapper" />
</SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-tooling-models-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-installation-beacon-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="PROVIDED">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-tooling-models-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="module-library" scope="PROVIDED">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-reflect-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="PROVIDED">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="PROVIDED">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.41" level="project" />
<orderEntry type="module-library" scope="PROVIDED">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="PROVIDED">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
@ -192,12 +135,22 @@
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.41" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.41" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41" level="project" /> <orderEntry type="module-library" scope="PROVIDED">
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.41" level="project" />
<orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.41" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="module-library" scope="PROVIDED">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -206,7 +159,151 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" /> <root url="jar://C:/gradle/lib/groovy-all-2.4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-installation-beacon-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.41" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-reflect-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-installation-beacon-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/gradle/src/installation-beacon" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/gradle/src" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/gradle/src" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/gradle/src" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-reflect-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

View file

@ -39,21 +39,84 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-api-4.8.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES>
</library> <root url="file://C:/gradle/src/announce" />
</orderEntry> <root url="file://C:/gradle/src/antlr" />
<orderEntry type="module-library"> <root url="file://C:/gradle/src/base-services" />
<library> <root url="file://C:/gradle/src/base-services-groovy" />
<CLASSES> <root url="file://C:/gradle/src/build-cache" />
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" /> <root url="file://C:/gradle/src/build-cache-http" />
</CLASSES> <root url="file://C:/gradle/src/build-comparison" />
<JAVADOC /> <root url="file://C:/gradle/src/build-init" />
<SOURCES /> <root url="file://C:/gradle/src/build-option" />
<root url="file://C:/gradle/src/cli" />
<root url="file://C:/gradle/src/code-quality" />
<root url="file://C:/gradle/src/composite-builds" />
<root url="file://C:/gradle/src/core" />
<root url="file://C:/gradle/src/core-api" />
<root url="file://C:/gradle/src/dependency-management" />
<root url="file://C:/gradle/src/diagnostics" />
<root url="file://C:/gradle/src/ear" />
<root url="file://C:/gradle/src/ide" />
<root url="file://C:/gradle/src/ide-native" />
<root url="file://C:/gradle/src/ide-play" />
<root url="file://C:/gradle/src/installation-beacon" />
<root url="file://C:/gradle/src/internal-android-performance-testing" />
<root url="file://C:/gradle/src/internal-integ-testing" />
<root url="file://C:/gradle/src/internal-performance-testing" />
<root url="file://C:/gradle/src/internal-testing" />
<root url="file://C:/gradle/src/ivy" />
<root url="file://C:/gradle/src/jacoco" />
<root url="file://C:/gradle/src/javascript" />
<root url="file://C:/gradle/src/jvm-services" />
<root url="file://C:/gradle/src/language-groovy" />
<root url="file://C:/gradle/src/language-java" />
<root url="file://C:/gradle/src/language-jvm" />
<root url="file://C:/gradle/src/language-native" />
<root url="file://C:/gradle/src/language-scala" />
<root url="file://C:/gradle/src/launcher" />
<root url="file://C:/gradle/src/logging" />
<root url="file://C:/gradle/src/maven" />
<root url="file://C:/gradle/src/messaging" />
<root url="file://C:/gradle/src/model-core" />
<root url="file://C:/gradle/src/model-groovy" />
<root url="file://C:/gradle/src/native" />
<root url="file://C:/gradle/src/osgi" />
<root url="file://C:/gradle/src/persistent-cache" />
<root url="file://C:/gradle/src/platform-base" />
<root url="file://C:/gradle/src/platform-jvm" />
<root url="file://C:/gradle/src/platform-native" />
<root url="file://C:/gradle/src/platform-play" />
<root url="file://C:/gradle/src/plugin-development" />
<root url="file://C:/gradle/src/plugin-use" />
<root url="file://C:/gradle/src/plugins" />
<root url="file://C:/gradle/src/process-services" />
<root url="file://C:/gradle/src/publish" />
<root url="file://C:/gradle/src/reporting" />
<root url="file://C:/gradle/src/resources" />
<root url="file://C:/gradle/src/resources-gcs" />
<root url="file://C:/gradle/src/resources-http" />
<root url="file://C:/gradle/src/resources-s3" />
<root url="file://C:/gradle/src/resources-sftp" />
<root url="file://C:/gradle/src/scala" />
<root url="file://C:/gradle/src/signing" />
<root url="file://C:/gradle/src/test-kit" />
<root url="file://C:/gradle/src/testing-base" />
<root url="file://C:/gradle/src/testing-junit-platform" />
<root url="file://C:/gradle/src/testing-jvm" />
<root url="file://C:/gradle/src/testing-native" />
<root url="file://C:/gradle/src/tooling-api" />
<root url="file://C:/gradle/src/tooling-api-builders" />
<root url="file://C:/gradle/src/version-control" />
<root url="file://C:/gradle/src/workers" />
<root url="file://C:/gradle/src/wrapper" />
</SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module" module-name="semver_main" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
@ -66,61 +129,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-1.2.41.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-tooling-models-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-installation-beacon-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-reflect-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/groovy-all-2.4.12.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -135,17 +144,8 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-4.8.1-bin/e8p42vx1m7a3mz9ydmjagn6wn/gradle-4.8.1/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="semver_main" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.2.41" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.2.41" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.spek:spek-api:1.1.5" level="project" />
<orderEntry type="module-library" scope="RUNTIME"> <orderEntry type="module-library" scope="RUNTIME">
<library> <library>
<CLASSES> <CLASSES>
@ -155,20 +155,144 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" name="Gradle: org.jetbrains.spek:spek-api:1.1.19" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.spek:spek-junit-platform-engine:1.1.5" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.spek:spek-junit-platform-engine:1.1.5" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-common:1.2.41" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-common:1.2.41" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-launcher:1.2.0" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.41" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.41" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-launcher:1.3.0-M1" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-engine:1.2.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-engine:1.3.0-M1" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-commons:1.2.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-commons:1.3.0-M1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.apiguardian:apiguardian-api:1.0.0" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.apiguardian:apiguardian-api:1.0.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.opentest4j:opentest4j:1.1.0" level="project" /> <orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/groovy-all-2.4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-installation-beacon-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-reflect-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.41" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.41" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.41" level="project" /> <orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-installation-beacon-4.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/gradle/src/installation-beacon" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/gradle/src" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/gradle/src" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-0.17.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://C:/gradle/src" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.41" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.41" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.41" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.opentest4j:opentest4j:1.1.0" level="project" />
</component> </component>
<component name="TestModuleProperties" production-module="semver_main" /> <component name="TestModuleProperties" production-module="semver_main" />
</module> </module>

6
.idea/vcs.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View file

@ -6,15 +6,14 @@ plugins {
`maven-publish` `maven-publish`
id("com.gradle.plugin-publish") version "0.9.10" id("com.gradle.plugin-publish") version "0.9.10"
id("com.github.ben-manes.versions") version "0.20.0" 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" version = "0.9.1"
group = "net.thauvin.erik.gradle" 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" var spekVersion = "1.1.5"
@ -27,6 +26,7 @@ dependencies {
testImplementation(kotlin("reflect")) testImplementation(kotlin("reflect"))
testImplementation(kotlin("test")) testImplementation(kotlin("test"))
testImplementation(gradleTestKit())
testImplementation("org.jetbrains.spek:spek-api:$spekVersion") { testImplementation("org.jetbrains.spek:spek-api:$spekVersion") {
exclude(group = "org.jetbrains.kotlin") exclude(group = "org.jetbrains.kotlin")
@ -40,18 +40,19 @@ dependencies {
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.2.0") { testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.2.0") {
because("Needed to run tests IDEs that bundle an older version") because("Needed to run tests IDEs that bundle an older version")
} }
testImplementation(gradleTestKit())
} }
tasks.withType<KotlinCompile> { tasks {
kotlinOptions.jvmTarget = "1.8" withType<KotlinCompile> {
// Gradle 4.6 kotlinOptions.jvmTarget = "1.8"
kotlinOptions.apiVersion = "1.2" // Gradle 4.6
} kotlinOptions.apiVersion = "1.2"
}
tasks.withType<Test> { withType<Test> {
useJUnitPlatform { useJUnitPlatform {
includeEngines("spek") includeEngines("spek")
}
} }
} }
@ -67,13 +68,13 @@ gradlePlugin {
pluginBundle { pluginBundle {
website = github website = github
vcsUrl = github vcsUrl = github
description = "Gradle plugin to automatically manage Semantic Version numbering." description = "Semantic Version Plugin for Gradle"
tags = listOf("semver", "version", "versioning") tags = listOf("semver", "semantic", "version", "versioning", "auto-increment", "kotlin", "java")
(plugins) { (plugins) {
project.name { project.name {
id = packageName id = packageName
displayName = "Gradle Semamtic Version Plugin" displayName = project.name
} }
} }
@ -81,4 +82,4 @@ pluginBundle {
groupId = project.group.toString() groupId = project.group.toString()
artifactId = project.name artifactId = project.name
} }
} }

View file

@ -58,5 +58,4 @@ open class SemverIncrementTask : DefaultTask() {
logger.warn("Version: ${project.version}") logger.warn("Version: ${project.version}")
SemverPlugin.saveProperties(config, version) SemverPlugin.saveProperties(config, version)
} }
} }

View file

@ -37,7 +37,7 @@ import org.gradle.api.Project
import java.io.File import java.io.File
import java.io.FileInputStream import java.io.FileInputStream
import java.io.FileOutputStream import java.io.FileOutputStream
import java.util.* import java.util.Properties
class SemverPlugin : Plugin<Project> { class SemverPlugin : Plugin<Project> {
private var version = Version() private var version = Version()