Switching for Kotlinter for #17.

.github/workflows/android_build.yml

@@ -20,4 +20,4 @@ jobs:
         run: ./gradlew test
 
       - name: Lint Checks
-        run: ./gradlew detekt ktlintCheck lint
+        run: ./gradlew detekt lintKotlin lint

README.md

@@ -51,7 +51,6 @@ You may notice that dependencies are set up in a very specific way. Each of the
 
 ```groovy
 subprojects {
-    apply from: "../buildscripts/ktlint.gradle"
     apply from: "../buildscripts/detekt.gradle"
     apply from: "../buildscripts/versionsplugin.gradle"
 }

app/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     id("kotlin-android")
+    id("org.jmailen.kotlinter")
 }
 
 android {

app/src/main/java/template/theme/Shape.kt

@@ -7,5 +7,5 @@ import androidx.compose.ui.unit.dp
 val Shapes = Shapes(
     small = RoundedCornerShape(4.dp),
     medium = RoundedCornerShape(4.dp),
-    large = RoundedCornerShape(0.dp),
+    large = RoundedCornerShape(0.dp)
 )

app/src/main/java/template/theme/Theme.kt

@@ -13,12 +13,12 @@ import androidx.compose.ui.platform.LocalContext
 
 private val darkColorScheme = darkColorScheme(
     primary = Purple200,
-    secondary = Teal200,
+    secondary = Teal200
 )
 
 private val lightColorScheme = lightColorScheme(
     primary = Purple500,
-    secondary = Teal200,
+    secondary = Teal200
 )
 
 @Composable

app/src/main/java/template/theme/Type.kt

@@ -12,5 +12,5 @@ val Typography = Typography(
         fontFamily = FontFamily.Default,
         fontWeight = FontWeight.Normal,
         fontSize = 16.sp
-    ),
+    )
 )

build.gradle.kts

@@ -3,9 +3,6 @@ buildscript {
     extra.apply {
         set("kotlinVersion", "1.7.10")
 
-        // https://github.com/JLLeitschuh/ktlint-gradle/releases
-        set("ktlintPluginVersion", "11.0.0")
-
         // https://github.com/detekt/detekt/releases
         set("detektVersion", "1.21.0")
 
@@ -22,7 +19,6 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:7.2.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra.get("kotlinVersion")}")
-        classpath("org.jlleitschuh.gradle:ktlint-gradle:${rootProject.extra.get("ktlintPluginVersion")}")
         classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${rootProject.extra.get("detektVersion")}")
         classpath("com.github.ben-manes:gradle-versions-plugin:${rootProject.extra.get("versionsPluginVersion")}")
 
@@ -31,11 +27,15 @@ buildscript {
     }
 }
 
+plugins {
+    // https://github.com/jeremymailen/kotlinter-gradle/releases
+    id("org.jmailen.kotlinter") version "3.13.0" apply false
+}
+
 apply(from = "buildscripts/githooks.gradle")
 apply(from = "buildscripts/setup.gradle")
 
 subprojects {
-    apply(from = "../buildscripts/ktlint.gradle")
     apply(from = "../buildscripts/detekt.gradle")
     apply(from = "../buildscripts/versionsplugin.gradle")
 }

documentation/StaticAnalysis.md

@@ -16,14 +16,14 @@ To run a detekt validation, use the following Gradle command:
 
 [Ktlint](https://github.com/pinterest/ktlint) is a static analysis tool from Pinterest that prevents bike shedding when it comes to code formatting. It also comes with a Gradle task to automatically format your entire codebase, if it can. The benefit of a tool like this is to ensure everyone on the team will have code formatted the same way, and there's no debating around white spaces, indentation, imports, etc. 
 
-We use the [JLLeitschuh](https://github.com/jlleitschuh/ktlint-gradle) Ktlint Gradle plugin in this project. You can find the setup in [this Gradle file](/buildscripts/ktlint.gradle).
+We use the [Kotlinter](https://github.com/jeremymailen/kotlinter-gradle) Ktlint Gradle plugin in this project.
 
 The following Gradle commands can be helpful:
 
 ```
 // Will format the codebase
-./gradlew ktlintFormat
+./gradlew formatKotlin
 
 // Will check if everything is formatted correctly
-./gradlew ktlintCheck
+./gradlew lintKotlin
 ```

git-hooks/pre-commit.sh

@@ -12,7 +12,7 @@ fi;
 echo "Running ktlint over these files:"
 echo "$CHANGED_FILES"
 
-./gradlew --quiet ktlintFormat -PinternalKtlintGitFilter="$CHANGED_FILES"
+./gradlew --quiet formatKotlin -PinternalKtlintGitFilter="$CHANGED_FILES"
 
 echo "Completed ktlint run."
 

git-hooks/pre-push.sh

@@ -2,5 +2,5 @@
 
 echo "Running static analysis."
 
-./gradlew ktlintCheck
+./gradlew lintKotlin
 ./gradlew detekt