Update kotlinter/ktlint

Annoyingly, this requires us to disable a different set of rules to work
around a different bug!

Signed-off-by: Graham <gpe@openrs2.dev>
bzip2
Graham 4 years ago
parent 9f1b2dbc29
commit 0546e05183
  1. 4
      .editorconfig
  2. 9
      build.gradle.kts
  3. 2
      buildSrc/src/main/java/Versions.kt

@ -13,9 +13,9 @@ indent_style = tab
# @formatter:on # @formatter:on
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
# see https://github.com/pinterest/ktlint/issues/527 # see https://github.com/pinterest/ktlint/issues/764
# noinspection EditorConfigKeyCorrectness # noinspection EditorConfigKeyCorrectness
disabled_rules = import-ordering disabled_rules = indent,parameter-list-wrapping
# @formatter:off # @formatter:off
[*.{xml,yaml,yml}] [*.{xml,yaml,yml}]

@ -1,5 +1,7 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jmailen.gradle.kotlinter.KotlinterExtension
import org.jmailen.gradle.kotlinter.KotlinterPlugin
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.net.URL import java.net.URL
@ -53,6 +55,13 @@ allprojects {
} }
} }
plugins.withType<KotlinterPlugin> {
configure<KotlinterExtension> {
// see https://github.com/pinterest/ktlint/issues/764
disabledRules = arrayOf("indent", "parameter-list-wrapping")
}
}
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {
options.release.set(11) options.release.set(11)
} }

@ -18,7 +18,7 @@ object Versions {
const val jimfs = "1.1" const val jimfs = "1.1"
const val junit = "5.6.2" const val junit = "5.6.2"
const val kotlin = "1.3.72" const val kotlin = "1.3.72"
const val kotlinter = "2.3.2" const val kotlinter = "3.0.2"
const val logback = "1.2.3" const val logback = "1.2.3"
const val netty = "4.1.51.Final" const val netty = "4.1.51.Final"
const val openrs2Natives = "2.0.1" const val openrs2Natives = "2.0.1"

Loading…
Cancel
Save