Merge pull request #2211 from Netflix/reenable-ktlint

re-enable ktlint by switching to ktlint-gradle

Author: paulbakker

CONTRIBUTING.md

@@ -93,12 +93,12 @@ don't miss any language features of newer Java releases while supporting a broad
 Code conventions
 -----
 We use the standard Kotlin coding conventions. Intellij should select the correct style automatically because we checked
-in the `.idea/codeStyle` folder. Furthermore, we're also using [Kotlinter](https://plugins.gradle.org/plugin/org.jmailen.kotlinter). You can run formatting manually using Gradle:
+in the `.idea/codeStyle` folder as well as defined rules in `.editorconfig`. Furthermore, we're also using [ktlint-gradle](https://github.com/JLLeitschuh/ktlint-gradle). You can run formatting manually using Gradle:
 
 ```bash
-./gradlew lintKotlin  # lint kotlin sources
-./gradlew :graphql-dgs-extended-validation:lintKotlin  # lint kotlin sources for a single module
-./gradlew formatKotlin # format Kotlin Sources
+./gradlew ktlintCheck  # lint kotlin sources
+./gradlew :graphql-dgs-extended-validation:ktlintCheck  # lint kotlin sources for a single module
+./gradlew ktlintFormat # format Kotlin Sources
 ```
 
 We recommend installing a Git push hook to run the style check to prevent failing the build for your branch.

build.gradle.kts

@@ -28,8 +28,7 @@ plugins {
 
     id("nebula.netflixoss") version "11.6.0"
     id("io.spring.dependency-management") version "1.1.7"
-
-//    id("org.jmailen.kotlinter") version "5.2.+"
+    id("org.jlleitschuh.gradle.ktlint") version "13.1.0"
     id("me.champeau.jmh") version "0.7.3"
 
     kotlin("jvm") version Versions.KOTLIN_VERSION
@@ -57,16 +56,16 @@ allprojects {
 val internalBomModules by extra(
     listOf(
         project(":graphql-dgs-platform"),
-        project(":graphql-dgs-platform-dependencies")
-    )
+        project(":graphql-dgs-platform-dependencies"),
+    ),
 )
 
 configure(subprojects.filterNot { it in internalBomModules }) {
 
     apply {
         plugin("java-library")
         plugin("kotlin")
-//        plugin("org.jmailen.kotlinter")
+        plugin("org.jlleitschuh.gradle.ktlint")
         plugin("me.champeau.jmh")
         plugin("io.spring.dependency-management")
     }
@@ -77,7 +76,7 @@ configure(subprojects.filterNot { it in internalBomModules }) {
     dependencyManagement {
         imports {
             mavenBom("org.jetbrains.kotlin:kotlin-bom:${Versions.KOTLIN_VERSION}")
-            mavenBom("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
+            mavenBom("org.springframework.boot:spring-boot-dependencies:$springBootVersion")
         }
     }
 
@@ -89,8 +88,8 @@ configure(subprojects.filterNot { it in internalBomModules }) {
         // Please refer to the following links for further reference.
         // * https://github.com/melix/jmh-gradle-plugin
         // * https://openjdk.java.net/projects/code-tools/jmh/
-        jmh("org.openjdk.jmh:jmh-core:${jmhVersion}")
-        jmh("org.openjdk.jmh:jmh-generator-annprocess:${jmhVersion}")
+        jmh("org.openjdk.jmh:jmh-core:$jmhVersion")
+        jmh("org.openjdk.jmh:jmh-generator-annprocess:$jmhVersion")
 
         testImplementation("org.springframework.boot:spring-boot-starter-test") {
             exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
@@ -140,12 +139,8 @@ configure(subprojects.filterNot { it in internalBomModules }) {
     kotlin {
         jvmToolchain(17)
         compilerOptions {
-           javaParameters = true
+            javaParameters = true
             freeCompilerArgs.addAll("-Xjvm-default=all-compatibility", "-java-parameters")
         }
     }
-
-//    kotlinter {
-//        reporters = arrayOf("checkstyle", "plain")
-//    }
 }

dgs-starter-test/build.gradle.kts

@@ -17,5 +17,4 @@
 dependencies {
     api(project(":graphql-dgs-spring-graphql-test"))
     api("org.springframework.graphql:spring-graphql-test")
-
-}
+}

dgs-starter/build.gradle.kts

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-
 dependencies {
     api(project(":graphql-dgs-spring-graphql"))
     api(project(":graphql-dgs-client"))
     api(project(":graphql-dgs-reactive"))
     api(project(":graphql-error-types"))
     api("org.springframework.boot:spring-boot-starter-graphql")
-}
+}

graphql-dgs-client/build.gradle.kts

@@ -43,4 +43,4 @@ dependencies {
 
 tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.addAll(listOf("--patch-module", "com.netflix.graphql.dgs.client=${sourceSets["main"].output.asPath}"))
-}
+}

graphql-dgs-extended-scalars/build.gradle.kts

@@ -25,4 +25,4 @@ dependencies {
 
 tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.addAll(listOf("--patch-module", "com.netflix.graphql.dgs.extendedscalars=${sourceSets["main"].output.asPath}"))
-}
+}

graphql-dgs-reactive/build.gradle.kts

@@ -27,4 +27,4 @@ dependencies {
 
 tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.addAll(listOf("--patch-module", "com.netflix.graphql.dgs.reactive=${sourceSets["main"].output.asPath}"))
-}
+}

graphql-dgs-spring-boot-micrometer/build.gradle.kts

@@ -17,4 +17,4 @@ dependencies {
 
 tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.addAll(listOf("--patch-module", "com.netflix.graphql.dgs.micrometer=${sourceSets["main"].output.asPath}"))
-}
+}

graphql-dgs-spring-graphql-starter-test/build.gradle.kts

@@ -20,4 +20,4 @@
  */
 dependencies {
     api(project(":dgs-starter-test"))
-}
+}

graphql-dgs-spring-graphql-starter/build.gradle.kts

@@ -20,4 +20,4 @@
  */
 dependencies {
     api(project(":dgs-starter"))
-}
+}