From 2a8111950a4058aedf2dfb359dbed60e311ff6b2 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Mon, 29 Jan 2024 02:34:08 +0600 Subject: [PATCH] Cleanup --- buildSrc/src/main/kotlin/detekt.gradle.kts | 6 +++--- config/detekt/detekt.yml | 2 +- gradle/compose.versions.toml | 1 - gradle/libs.versions.toml | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/detekt.gradle.kts b/buildSrc/src/main/kotlin/detekt.gradle.kts index f86846988..986138ee6 100644 --- a/buildSrc/src/main/kotlin/detekt.gradle.kts +++ b/buildSrc/src/main/kotlin/detekt.gradle.kts @@ -1,4 +1,4 @@ - +import io.gitlab.arturbosch.detekt.Detekt import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask import org.gradle.accessors.dm.LibrariesForLibs @@ -29,7 +29,7 @@ detekt { baseline = file(baselineFile) } -tasks.withType().configureEach { +tasks.withType().configureEach { include(kotlinFiles) exclude(resourceFiles, buildFiles, generatedFiles, scriptsFiles) reports { @@ -39,7 +39,7 @@ tasks.withType().configureEach { } } -tasks.withType().configureEach { +tasks.withType().configureEach { jvmTarget = JavaVersion.VERSION_17.toString() } tasks.withType().configureEach { diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml index d25c48b4f..112fcf3f0 100644 --- a/config/detekt/detekt.yml +++ b/config/detekt/detekt.yml @@ -16,4 +16,4 @@ style: ignorePropertyDeclaration: true ignoreCompanionObjectPropertyDeclaration: true UnusedPrivateMember: - ignoreAnnotated: [ 'Preview' ] \ No newline at end of file + ignoreAnnotated: [ 'Preview' ] diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml index bd0ab625a..dd963d0d6 100644 --- a/gradle/compose.versions.toml +++ b/gradle/compose.versions.toml @@ -23,4 +23,3 @@ glance = "androidx.glance:glance-appwidget:1.0.0" accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ffcb3b6e..576d08176 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -94,6 +94,7 @@ voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version. voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager" } voyager-tab-navigator = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager" } voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" } + detekt-gradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } detekt-rules-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } detekt-rules-compose = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektCompose" }