Deteket (#237)

* Add detekt as versions toml * Add detekt in build.gradle.kts * Add detekt to storage-base * Add it to workflow * Update file, complaining by detekt * Add detekt to all modules * Detekt changes * Fixing detekt * Detekt changes * Add detekt to app * APp detekt
alorma · Mar 6, 2024 · 2154b18 · 2154b18
1 parent cc51640
commit 2154b18
Show file tree

Hide file tree

Showing 43 changed files with 972 additions and 219 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -150,6 +150,24 @@ jobs:
       - name: Build sample Wasm - PR
         run: ./gradlew :composeApp:compileKotlinWasmJs
 
+  detekt:
+    name: Detekt - PR
+    if: ${{ success() }}
+    needs: [ build-sample-android, build-sample-iOS, build-sample-desktop, build-sample-wasm ]
+    runs-on: macos-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: adopt
+          java-version: 17
+
+      - name: Detekt - PR
+        run: ./gradlew detektAll
+
   check-sign:
     name: Check signature - PR
     if: ${{ success() }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,12 +1,14 @@
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
+import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
   alias(libs.plugins.jetbrainsCompose) apply false
   alias(libs.plugins.androidApplication) apply false
   alias(libs.plugins.androidLibrary) apply false
   alias(libs.plugins.kotlinMultiplatform) apply false
   alias(libs.plugins.kotlinAndroid) apply false
+  alias(libs.plugins.detekt).apply(false)
 }
 
 buildscript {
@@ -29,6 +31,11 @@ allprojects {
   }
 }
 
+tasks.register("detektAll") {
+  allprojects {
+    this@register.dependsOn(tasks.withType<Detekt>())
+  }
+}
 
 rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin::class.java) {
   rootProject.the<YarnRootExtension>().yarnLockMismatchReport = YarnLockMismatchReport.NONE

diff --git a/compose-settings-storage-base/build.gradle.kts b/compose-settings-storage-base/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
   alias(libs.plugins.kotlinMultiplatform)
   alias(libs.plugins.androidLibrary)
   alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.detekt)
 }
 
 apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle")
@@ -95,4 +96,8 @@ compose.desktop {
       //packageVersion = rootProject.findProperty("libVersion").toString()
     }
   }
+}
+
+dependencies {
+  detektPlugins(libs.compose.detekt.rules)
 }
diff --git a/...age-base/src/commonMain/kotlin/com/alorma/compose/settings/storage/base/ValueProviders.kt b/...age-base/src/commonMain/kotlin/com/alorma/compose/settings/storage/base/ValueProviders.kt
@@ -19,4 +19,4 @@ interface SettingValueState<T> {
   fun reset()
 
   var value: T
-}
+}
diff --git a/compose-settings-storage-disk/build.gradle.kts b/compose-settings-storage-disk/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
   alias(libs.plugins.kotlinMultiplatform)
   alias(libs.plugins.androidLibrary)
   alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.detekt)
 }
 
 apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle")
@@ -104,4 +105,8 @@ compose.desktop {
       packageVersion = "1.0.0"
     }
   }
+}
+
+dependencies {
+  detektPlugins(libs.compose.detekt.rules)
 }
diff --git a/...Main/kotlin/com/alorma/compose/settings/storage/disk/IntSetPreferenceSettingValueState.kt b/...Main/kotlin/com/alorma/compose/settings/storage/disk/IntSetPreferenceSettingValueState.kt
diff --git a/...rc/commonMain/kotlin/com/alorma/compose/settings/storage/disk/BooleanSettingValueState.kt b/...rc/commonMain/kotlin/com/alorma/compose/settings/storage/disk/BooleanSettingValueState.kt
@@ -41,4 +41,4 @@ class BooleanSettingValueState(
   override fun reset() {
     value = defaultValue
   }
-}
+}
diff --git a/...src/commonMain/kotlin/com/alorma/compose/settings/storage/disk/IntSetSettingValueState.kt b/...src/commonMain/kotlin/com/alorma/compose/settings/storage/disk/IntSetSettingValueState.kt
diff --git a/...c/commonMain/kotlin/com/alorma/compose/settings/storage/disk/TriStateSettingValueState.kt b/...c/commonMain/kotlin/com/alorma/compose/settings/storage/disk/TriStateSettingValueState.kt
@@ -45,4 +45,4 @@ class TriStateSettingValueState(
   override fun reset() {
     value = defaultValue
   }
-}
+}
diff --git a/compose-settings-storage-memory/build.gradle.kts b/compose-settings-storage-memory/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
   alias(libs.plugins.kotlinMultiplatform)
   alias(libs.plugins.androidLibrary)
   alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.detekt)
 }
 
 apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle")
@@ -101,4 +102,8 @@ compose.desktop {
       packageVersion = "1.0.0"
     }
   }
+}
+
+dependencies {
+  detektPlugins(libs.compose.detekt.rules)
 }
diff --git a/.../commonMain/kotlin/com/alorma/compose/settings/storage/memory/BooleanSettingValueState.kt b/.../commonMain/kotlin/com/alorma/compose/settings/storage/memory/BooleanSettingValueState.kt
@@ -18,4 +18,4 @@ internal class InMemoryBooleanSettingValueState(private val defaultValue: Boolea
   override fun reset() {
     value = defaultValue
   }
-}
+}
diff --git a/...rc/commonMain/kotlin/com/alorma/compose/settings/storage/memory/FloatSettingValueState.kt b/...rc/commonMain/kotlin/com/alorma/compose/settings/storage/memory/FloatSettingValueState.kt
@@ -18,4 +18,4 @@ internal class InMemoryFloatSettingValueState(private val defaultValue: Float) :
   override fun reset() {
     value = defaultValue
   }
-}
+}
diff --git a/...c/commonMain/kotlin/com/alorma/compose/settings/storage/memory/IntSetSettingValueState.kt b/...c/commonMain/kotlin/com/alorma/compose/settings/storage/memory/IntSetSettingValueState.kt
diff --git a/.../src/commonMain/kotlin/com/alorma/compose/settings/storage/memory/IntSettingValueState.kt b/.../src/commonMain/kotlin/com/alorma/compose/settings/storage/memory/IntSettingValueState.kt
@@ -18,4 +18,4 @@ internal class InMemoryIntSettingValueState(private val defaultValue: Int) :
   override fun reset() {
     value = defaultValue
   }
-}
+}
diff --git a/...c/commonMain/kotlin/com/alorma/compose/settings/storage/memory/StringSettingValueState.kt b/...c/commonMain/kotlin/com/alorma/compose/settings/storage/memory/StringSettingValueState.kt
@@ -18,4 +18,4 @@ internal class InMemoryStringSettingValueState(private val defaultValue: String?
   override fun reset() {
     value = defaultValue
   }
-}
+}
diff --git a/...commonMain/kotlin/com/alorma/compose/settings/storage/memory/TriStateSettingValueState.kt b/...commonMain/kotlin/com/alorma/compose/settings/storage/memory/TriStateSettingValueState.kt
@@ -18,4 +18,4 @@ internal class InMemoryTriStateSettingValueState(private val defaultValue: Boole
   override fun reset() {
     value = defaultValue
   }
-}
+}
diff --git a/compose-settings-ui/build.gradle.kts b/compose-settings-ui/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
   alias(libs.plugins.kotlinMultiplatform)
   alias(libs.plugins.androidLibrary)
   alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.detekt)
 }
 
 apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle")
@@ -102,4 +103,8 @@ compose.desktop {
       packageVersion = "1.0.0"
     }
   }
+}
+
+dependencies {
+  detektPlugins(libs.compose.detekt.rules)
 }
diff --git a/compose-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt b/compose-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt
@@ -34,7 +34,6 @@ fun SettingsCheckbox(
       role = Role.Switch,
       onValueChange = { update(!state) },
     ).then(modifier),
-    enabled = enabled,
     title = title,
     subtitle = subtitle,
     icon = icon,

diff --git a/compose-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsMenuLink.kt b/compose-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsMenuLink.kt
@@ -10,10 +10,10 @@ import com.alorma.compose.settings.ui.internal.SettingsTileScaffold
 
 @Composable
 fun SettingsMenuLink(
+  title: @Composable () -> Unit,
   modifier: Modifier = Modifier,
   enabled: Boolean = true,
   icon: (@Composable () -> Unit)? = null,
-  title: @Composable () -> Unit,
   subtitle: (@Composable () -> Unit)? = null,
   action: (@Composable () -> Unit)? = null,
   colors: ListItemColors = ListItemDefaults.colors(),
@@ -26,13 +26,12 @@ fun SettingsMenuLink(
       enabled = enabled,
       onClick = onClick,
     ).then(modifier),
-    enabled = enabled,
     title = title,
     subtitle = subtitle,
     icon = icon,
-    action = action,
     colors = colors,
     tonalElevation = tonalElevation,
     shadowElevation = shadowElevation,
+    action = action,
   )
 }
diff --git a/...e-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsRadioButton.kt b/...e-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsRadioButton.kt
@@ -33,7 +33,6 @@ fun SettingsRadioButton(
       role = Role.RadioButton,
       onValueChange = { onClick() },
     ).then(modifier),
-    enabled = enabled,
     title = title,
     subtitle = subtitle,
     icon = icon,

diff --git a/compose-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSlider.kt b/compose-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSlider.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.unit.dp
 import com.alorma.compose.settings.ui.internal.SettingsTileScaffold
 
 @Composable
+@Suppress("LongParameterList")
 fun SettingsSlider(
   title: @Composable () -> Unit,
   value: Float,
@@ -32,7 +33,6 @@ fun SettingsSlider(
 ) {
   SettingsTileScaffold(
     modifier = modifier,
-    enabled = enabled,
     title = title,
     subtitle = {
       Column {

diff --git a/compose-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSwitch.kt b/compose-settings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSwitch.kt
@@ -35,7 +35,6 @@ fun SettingsSwitch(
       role = Role.Switch,
       onValueChange = { update(!state) },
     ).then(modifier),
-    enabled = enabled,
     title = title,
     subtitle = subtitle,
     icon = icon,

diff --git a/...tings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsTriStateCheckbox.kt b/...tings-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsTriStateCheckbox.kt
@@ -45,7 +45,6 @@ fun SettingsTriStateCheckbox(
       verticalAlignment = Alignment.CenterVertically,
     ) {
       SettingsTileScaffold(
-        enabled = enabled,
         title = title,
         subtitle = subtitle,
         icon = icon,