diff --git a/FloconDesktop/build.gradle.kts b/FloconDesktop/build.gradle.kts index 7a1b52c2..0bfefeca 100644 --- a/FloconDesktop/build.gradle.kts +++ b/FloconDesktop/build.gradle.kts @@ -7,10 +7,8 @@ plugins { alias(libs.plugins.kotlinJvm) apply false alias(libs.plugins.kotlinMultiplatform) apply false alias(libs.plugins.ksp) apply false - alias(libs.plugins.ktlint) apply false // Ajout de Ktlint alias(libs.plugins.aboutLibraries) apply false alias(libs.plugins.android.kotlin.multiplatform.library) apply false - alias(libs.plugins.android.lint) apply false // Ajout de Ktlint alias(libs.plugins.buildconfig) apply false } diff --git a/FloconDesktop/composeApp/build.gradle.kts b/FloconDesktop/composeApp/build.gradle.kts index c5e58ebe..ffa2f31b 100644 --- a/FloconDesktop/composeApp/build.gradle.kts +++ b/FloconDesktop/composeApp/build.gradle.kts @@ -10,7 +10,6 @@ plugins { alias(libs.plugins.kotlinx.serialization) alias(libs.plugins.ksp) // Add KSP plugin alias(libs.plugins.room) - alias(libs.plugins.ktlint) alias(libs.plugins.aboutLibraries) alias(libs.plugins.buildconfig) @@ -96,22 +95,8 @@ kotlin { } } -ktlint { - android.set(false) - outputToConsole.set(true) - filter { - exclude { element -> - val path = element.file.path - path.contains("/generated/") - } - include("**/kotlin/**") - exclude("**/generated/**", "**/ClosableScopeExt.kt", "**/ViewModelExt.kt", "**/Interactions.kt") - } -} - dependencies { ksp(libs.androidx.room.compiler) - ktlintRuleset("io.nlopez.compose.rules:ktlint:0.4.24") } room { diff --git a/FloconDesktop/data/core/build.gradle.kts b/FloconDesktop/data/core/build.gradle.kts index fe3c8dda..88f31b1a 100644 --- a/FloconDesktop/data/core/build.gradle.kts +++ b/FloconDesktop/data/core/build.gradle.kts @@ -1,7 +1,6 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.kotlinx.serialization) - alias(libs.plugins.ktlint) } kotlin { @@ -34,16 +33,3 @@ kotlin { } } } - -ktlint { - android.set(false) - outputToConsole.set(true) - filter { - exclude { element -> - val path = element.file.path - path.contains("/generated/") - } - include("**/kotlin/**") - exclude("**/generated/**") - } -} diff --git a/FloconDesktop/data/local/build.gradle.kts b/FloconDesktop/data/local/build.gradle.kts index c9dd8f1f..0c419d45 100644 --- a/FloconDesktop/data/local/build.gradle.kts +++ b/FloconDesktop/data/local/build.gradle.kts @@ -3,7 +3,6 @@ plugins { alias(libs.plugins.kotlinx.serialization) alias(libs.plugins.room) alias(libs.plugins.ksp) - alias(libs.plugins.ktlint) } kotlin { @@ -49,16 +48,3 @@ dependencies { room { schemaDirectory("$projectDir/schemas") } - -ktlint { - android.set(false) - outputToConsole.set(true) - filter { - exclude { element -> - val path = element.file.path - path.contains("/generated/") - } - include("**/kotlin/**") - exclude("**/generated/**") - } -} diff --git a/FloconDesktop/data/remote/build.gradle.kts b/FloconDesktop/data/remote/build.gradle.kts index bc9058a3..e411d9d9 100644 --- a/FloconDesktop/data/remote/build.gradle.kts +++ b/FloconDesktop/data/remote/build.gradle.kts @@ -1,8 +1,6 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.kotlinx.serialization) - - alias(libs.plugins.ktlint) } kotlin { @@ -48,16 +46,3 @@ kotlin { } } } - -ktlint { - android.set(false) - outputToConsole.set(true) - filter { - exclude { element -> - val path = element.file.path - path.contains("/generated/") - } - include("**/kotlin/**") - exclude("**/generated/**") - } -} diff --git a/FloconDesktop/domain/build.gradle.kts b/FloconDesktop/domain/build.gradle.kts index ec6f60ca..2642ee63 100644 --- a/FloconDesktop/domain/build.gradle.kts +++ b/FloconDesktop/domain/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.ktlint) } kotlin { @@ -30,16 +29,3 @@ kotlin { } } } - -ktlint { - android.set(false) - outputToConsole.set(true) - filter { - exclude { element -> - val path = element.file.path - path.contains("/generated/") - } - include("**/kotlin/**") - exclude("**/generated/**") - } -} diff --git a/FloconDesktop/gradle/libs.versions.toml b/FloconDesktop/gradle/libs.versions.toml index db82edd8..e123fd78 100644 --- a/FloconDesktop/gradle/libs.versions.toml +++ b/FloconDesktop/gradle/libs.versions.toml @@ -121,7 +121,6 @@ ktor = { id = "io.ktor.plugin", version.ref = "ktor" } kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } room = { id = "androidx.room", version.ref = "room" } -ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintGradle" } aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibraries" } android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" } android-lint = { id = "com.android.lint", version.ref = "agp" } diff --git a/FloconDesktop/library/designsystem/build.gradle.kts b/FloconDesktop/library/designsystem/build.gradle.kts index 014ac412..fec6b83c 100644 --- a/FloconDesktop/library/designsystem/build.gradle.kts +++ b/FloconDesktop/library/designsystem/build.gradle.kts @@ -4,7 +4,6 @@ plugins { alias(libs.plugins.composeCompiler) alias(libs.plugins.composeMultiplatform) alias(libs.plugins.composeHotReload) - alias(libs.plugins.ktlint) } kotlin { @@ -50,16 +49,3 @@ kotlin { } } } - -ktlint { - android.set(false) - outputToConsole.set(true) - filter { - exclude { element -> - val path = element.file.path - path.contains("/generated/") - } - include("**/kotlin/**") - exclude("**/generated/**") - } -} diff --git a/FloconDesktop/navigation/build.gradle.kts b/FloconDesktop/navigation/build.gradle.kts index 818f9da4..2a3533e5 100644 --- a/FloconDesktop/navigation/build.gradle.kts +++ b/FloconDesktop/navigation/build.gradle.kts @@ -6,7 +6,6 @@ plugins { alias(libs.plugins.composeCompiler) alias(libs.plugins.composeMultiplatform) - alias(libs.plugins.ktlint) alias(libs.plugins.kotlinx.serialization) } @@ -48,16 +47,3 @@ kotlin { } } } - -ktlint { - android.set(false) - outputToConsole.set(true) - filter { - exclude { element -> - val path = element.file.path - path.contains("/generated/") - } - include("**/kotlin/**") - exclude("**/generated/**") - } -}