Replacing Spotless with Ktlint

VahidGarousi · Jan 27, 2023 · d5f0696 · d5f0696
1 parent 6ac906c
commit d5f0696
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 13 deletions.
diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
@@ -24,4 +24,4 @@ jobs:
         run: ./gradlew assemble
 
       - name: Static Analysis
-        run: ./gradlew spotlessCheck detekt
+        run: ./gradlew ktlintCheck detekt
diff --git a/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/data/LightStreamerConnection.kt b/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/data/LightStreamerConnection.kt
@@ -1,4 +1,4 @@
-@file:Suppress("LongParameterList","TooManyFunctions")
+@file:Suppress("LongParameterList", "TooManyFunctions")
 
 package dev.garousi.stockwatcher.feature.watchlist.data
 

diff --git a/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/data/SubscriptionMode.kt b/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/data/SubscriptionMode.kt
@@ -1,7 +1,7 @@
 @file:Suppress("UnusedPrivateMember")
 package dev.garousi.stockwatcher.feature.watchlist.data
 
-enum class SubscriptionMode(mode: String) {
-    Merge("MERGE"),
-    Command("COMMAND"),
+enum class SubscriptionMode {
+    Merge,
+    Command,
 }
diff --git a/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/presentation/StockList.kt b/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/presentation/StockList.kt
@@ -41,7 +41,7 @@ fun StockList(
         ) {
             itemsIndexed(
                 items = stocks,
-                key = { index, item -> item.itemName },
+                key = { _, item -> item.itemName },
             ) { index, stock ->
                 StockItem(
                     stock = stock,

diff --git a/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/presentation/WatchlistScreen.kt b/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/presentation/WatchlistScreen.kt
@@ -28,7 +28,6 @@ import androidx.compose.material.primarySurface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.Center
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier

diff --git a/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/presentation/WatchlistState.kt b/app/src/main/java/dev/garousi/stockwatcher/feature/watchlist/presentation/WatchlistState.kt
@@ -1,4 +1,4 @@
-@file:Suppress("MagicNumber","ForEachOnRange")
+@file:Suppress("MagicNumber", "ForEachOnRange")
 package dev.garousi.stockwatcher.feature.watchlist.presentation
 
 import dev.garousi.stockwatcher.feature.watchlist.domain.models.Stock

diff --git a/app/src/main/java/dev/garousi/stockwatcher/ui/StockWatcherApp.kt b/app/src/main/java/dev/garousi/stockwatcher/ui/StockWatcherApp.kt
@@ -33,7 +33,6 @@ fun StockWatcherApp(
                 testTagsAsResourceId = true
             },
         bottomBar = {
-
         },
     ) { padding ->
         Row(

diff --git a/app/src/main/java/dev/garousi/stockwatcher/ui/theme/Theme.kt b/app/src/main/java/dev/garousi/stockwatcher/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-@file:Suppress("MagicNumber","FunctionNaming")
+@file:Suppress("MagicNumber", "FunctionNaming")
 package dev.garousi.stockwatcher.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme

diff --git a/build.gradle b/build.gradle
@@ -9,12 +9,13 @@ plugins {
     id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
     id 'com.google.dagger.hilt.android' version '2.44.2' apply false
     id "com.github.ben-manes.versions" version "0.44.0"
-    id "com.diffplug.spotless" version "6.12.1"
+//    id "com.diffplug.spotless" version "6.12.1"
     id "io.gitlab.arturbosch.detekt" version "1.22.0"
+    id "org.jlleitschuh.gradle.ktlint" version "10.2.0"
 }
 
 subprojects {
-    apply from: "../buildscripts/versionsplugin.gradle"
-    apply from: "../buildscripts/spotless.gradle"
+    apply from: "../buildscripts/ktlint.gradle"
     apply from: "../buildscripts/detekt.gradle"
+    apply from: "../buildscripts/versionsplugin.gradle"
 }
diff --git a/buildscripts/ktlint.gradle b/buildscripts/ktlint.gradle
@@ -0,0 +1,14 @@
+apply plugin: "org.jlleitschuh.gradle.ktlint"
+
+ktlint {
+    // https://github.com/pinterest/ktlint/releases
+    version = "0.45.2"
+
+    reporters {
+        reporter "plain"
+        reporter "checkstyle"
+        reporter "html"
+    }
+
+    outputColorName = "RED"
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,6 @@ fun StockWatcherApp( @@
                     testTagsAsResourceId = true
                 },
             bottomBar = {
             },
         ) { padding ->
             Row(
@@ Expand Down @@