From 0202eb66dd5c8436cc8e091cbfbe4063740f3a3d Mon Sep 17 00:00:00 2001 From: Bernardo Gomez Palacio Date: Fri, 4 Jun 2021 17:54:27 -0700 Subject: [PATCH] Adopt kotlinter-gradle instead of org.jlleitschuh.gradle:ktlint-gradle --- Makefile | 2 +- build.gradle.kts | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ee51ac1ac..ed23da96c 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ GW_OPT_DISABLE_LOCAL= format: ## Formats source code - $(GW_CMD) ktlintFormat + $(GW_CMD) formatKotlin publish-local: ## Clans, bulds, and publishes the Codegen artifacts to mavenLocal, as a SNAPSHOT. diff --git a/build.gradle.kts b/build.gradle.kts index f1f5324aa..98f0c74c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,7 +28,7 @@ plugins { `java-library` id("nebula.netflixoss") version "9.4.2" id("nebula.dependency-recommender") version "10.0.1" - id("org.jlleitschuh.gradle.ktlint") version "10.0.0" + id("org.jmailen.kotlinter") version "3.4.4" kotlin("jvm") version Versions.KOTLIN_VERSION kotlin("kapt") version Versions.KOTLIN_VERSION idea @@ -67,7 +67,7 @@ configure(subprojects.filterNot { it in internalBomModules }) { plugin("java-library") plugin("kotlin") plugin("kotlin-kapt") - plugin("org.jlleitschuh.gradle.ktlint") + plugin("org.jmailen.kotlinter") } /** @@ -128,7 +128,10 @@ configure(subprojects.filterNot { it in internalBomModules }) { } } - configure { - disabledRules.set(setOf("no-wildcard-imports")) + kotlinter { + indentSize = 4 + reporters = arrayOf("checkstyle", "plain") + experimentalRules = false + disabledRules = arrayOf("no-wildcard-imports") } }