improving static code analysis for sample Kotlin app and bumping Kotlin version

Author: pwittchen

.editorconfig

@@ -0,0 +1,10 @@
+[*.{kt,kts}]
+# possible values: number (e.g. 2), "unset" (makes ktlint ignore indentation completely)
+indent_size=2
+# possible values: number (e.g. 2), "unset"
+continuation_indent_size=2
+# true (recommended) / false
+insert_final_newline=unset
+# possible values: number (e.g. 120) (package name, imports & comments are ignored), "off"
+# it's automatically set to 100 on `ktlint --android ...` (per Android Kotlin Style Guide)
+max_line_length=off

README.md

@@ -457,7 +457,7 @@ Static code analysis runs Checkstyle, FindBugs, PMD, Lint, ErrorProne and NullAw
 Static code analysis for the sample Kotlin app with detekt can be executed as follows:
 
 ```
-./gradlew detektCheck
+./gradlew detektCheck ktlintCheck
 ```
 
 Reports from analysis are generated in `library/build/reports/` directory.

app-kotlin/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'io.gitlab.arturbosch.detekt'
+apply plugin: 'org.jlleitschuh.gradle.ktlint'
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion
@@ -36,14 +37,19 @@ android {
 }
 
 detekt {
-  version = "1.0.0.RC6-1"
+  version = rootProject.ext.detektVersion
   profile("main") {
     input = "$projectDir"
     config = "$projectDir/detekt.yml"
     filters = ".*test.*,.*/resources/.*,.*/tmp/.*"
   }
 }
 
+ktlint {
+  verbose = true
+  reporters = ["CHECKSTYLE", "PLAIN"]
+}
+
 dependencies {
   implementation project(':library')
   implementation deps.kotlinstdlib
@@ -63,5 +69,6 @@ buildscript {
   dependencies {
     classpath deps.kotlingradleplugin
     classpath deps.detekt
+    classpath deps.ktlintgradle
   }
 }

app-kotlin/src/main/kotlin/com/github/pwittchen/reactivenetwork/kotlinapp/MainActivity.kt

@@ -42,21 +42,21 @@ class MainActivity : Activity() {
     super.onResume()
 
     connectivityDisposable = ReactiveNetwork.observeNetworkConnectivity(applicationContext)
-        .subscribeOn(Schedulers.io())
-        .observeOn(AndroidSchedulers.mainThread())
-        .subscribe { connectivity ->
-          Log.d(TAG, connectivity.toString())
-          val state = connectivity.state()
-          val name = connectivity.typeName()
-          connectivity_status.text = String.format("state: %s, typeName: %s", state, name)
-        }
+      .subscribeOn(Schedulers.io())
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe { connectivity ->
+        Log.d(TAG, connectivity.toString())
+        val state = connectivity.state()
+        val name = connectivity.typeName()
+        connectivity_status.text = String.format("state: %s, typeName: %s", state, name)
+      }
 
     internetDisposable = ReactiveNetwork.observeInternetConnectivity()
-        .subscribeOn(Schedulers.io())
-        .observeOn(AndroidSchedulers.mainThread())
-        .subscribe { isConnectedToInternet ->
-          internet_status.text = isConnectedToInternet.toString()
-        }
+      .subscribeOn(Schedulers.io())
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe { isConnectedToInternet ->
+        internet_status.text = isConnectedToInternet.toString()
+      }
   }
 
   override fun onPause() {
@@ -70,4 +70,4 @@ class MainActivity : Activity() {
       disposable.dispose()
     }
   }
-}
+}

build.gradle

@@ -6,7 +6,8 @@ ext {
   compileSdkVersion = 28
   buildToolsVersion = '28'
   gradleVersion = '4.4.1'
-  kotlinVersion = '1.2.51'
+  kotlinVersion = '1.2.60'
+  detektVersion = '1.0.0.RC6-1'
 }
 
 ext.deps = [rxjava2           : 'io.reactivex.rxjava2:rxjava:2.2.0',
@@ -19,9 +20,10 @@ ext.deps = [rxjava2           : 'io.reactivex.rxjava2:rxjava:2.2.0',
             mockitocore       : 'org.mockito:mockito-core:2.21.0',
             nullaway          : 'com.uber.nullaway:nullaway:0.5.3',
             errorprone        : 'com.google.errorprone:error_prone_core:2.3.1',
+            ktlintgradle      : 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:4.1.0',
             kotlinstdlib      : "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion",
             kotlingradleplugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion",
-            detekt            : "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0.RC6-1"]
+            detekt            : "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"]
 
 buildscript {
   repositories {