Switch to kotlinter instead of (directly) ktlint

Author: xenomachina

build.gradle

@@ -30,6 +30,7 @@ buildscript {
 plugins {
     id "com.jfrog.bintray" version "1.8.0"
     id 'net.researchgate.release' version "2.6.0"
+    id 'org.jmailen.kotlinter' version '1.7.0'
 }
 
 apply plugin: 'maven'
@@ -68,35 +69,6 @@ sourceSets {
     main.java.srcDirs += 'src/main/kotlin'
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// ktlint config
-//////////////////////////////////////////////////////////////////////////////
-
-// Based on https://github.com/shyiko/ktlint
-
-configurations {
-    ktlint
-}
-
-dependencies {
-    ktlint "com.github.shyiko:ktlint:$ktlint_version"
-}
-
-task ktlint(type: JavaExec) {
-    main = "com.github.shyiko.ktlint.Main"
-    classpath = configurations.ktlint
-    args "src/**/*.kt"
-}
-
-check.dependsOn ktlint
-
-task ktlintFormat(type: JavaExec) {
-    main = "com.github.shyiko.ktlint.Main"
-    classpath = configurations.ktlint
-    args "-F", "src/**/*.kt"
-}
-
-
 //////////////////////////////////////////////////////////////////////////////
 // Dokka config
 //////////////////////////////////////////////////////////////////////////////

gradle.properties

@@ -4,5 +4,4 @@ version=2.0.5-SNAPSHOT
 dokka_version = 0.9.15
 kotlintest_version = 2.0.7
 kotlin_version = 1.2.20
-ktlint_version = 0.14.0
 xenocom_version = 0.0.5

src/main/kotlin/com/xenomachina/argparser/ArgParser.kt

@@ -386,10 +386,8 @@ class ArgParser(args: Array<out String>,
     ) {
         operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): Delegate<T> {
             val delegate = ctor(prop.name)
-            return (if (default == null)
-                delegate
-            else
-                delegate.default(default)).provideDelegate(thisRef, prop)
+            return (if (default == null) delegate
+                    else delegate.default(default)).provideDelegate(thisRef, prop)
         }
     }
 

src/main/kotlin/com/xenomachina/argparser/Default.kt

@@ -84,7 +84,7 @@ fun <T> ArgParser.Delegate<T>.default(defaultValue: () -> T): ArgParser.Delegate
             get() = inner.help
 
         override fun addValidator(validator: ArgParser.Delegate<T>.() -> Unit): ArgParser.Delegate<T> =
-            apply { inner.addValidator { validator(this@apply) } }
+                apply { inner.addValidator { validator(this@apply) } }
 
         override fun registerLeaf(root: ArgParser.Delegate<*>) {
             inner.registerLeaf(root)