update detekt version

matsumo0922 · Dec 10, 2023 · 1da3006 · 1da3006
1 parent 2345738
commit 1da3006
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/build-logic/convention/src/main/java/caios/android/fanbox/Detekt.kt b/build-logic/convention/src/main/java/caios/android/fanbox/Detekt.kt
@@ -9,10 +9,11 @@ import org.gradle.kotlin.dsl.withType
 
 internal fun Project.configureDetekt(extension: DetektExtension) {
     extension.apply {
+        toolVersion = libs.findVersion("detekt").get().toString()
         // 並列処理
         parallel = true
         // Detektの設定ファイル
-        config = files("${project.rootDir}/config/detekt/detekt.yml")
+        config.setFrom(files("${project.rootDir}/config/detekt/detekt.yml"))
         // baseline 設定ファイル
         baseline = file("${project.rootDir}/config/detekt/baseline.xml")
         // デフォルト設定の上に自分の設定ファイルを適用する

diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
@@ -57,9 +57,6 @@ style:
   # プロパティ、メソッド、companion object の順番を強制する
   ClassOrdering:
     active: true
-  # 複数行の if 文は中括弧を強制する
-  MandatoryBracesIfStatements:
-    active: true
   # 複数行の for, while... は中括弧を強制する
   MandatoryBracesLoops:
     active: true

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -70,7 +70,7 @@ dagger = "2.48"
 ktor = "2.3.4"
 coil = "2.4.0"
 jsoup = "1.16.1"
-detekt = "1.23.1"
+detekt = "1.23.3"
 balloon = "1.5.3"
 zoomable = "1.5.2"
 pinchZoomGrid = "0.0.4"