From 4301c79e8c0422039a8ca9cc1d223a719c6619df Mon Sep 17 00:00:00 2001
From: Maksim Pozdeev <m.l.pozdeev@gmail.com>
Date: Mon, 11 Jul 2022 11:17:35 +0400
Subject: [PATCH] Updated detekt version and config

---
 gradle/plugins/build.gradle.kts                          | 4 ++--
 .../main/java/static_analysis/linters/DetektLinter.kt    | 8 ++++----
 .../plugins/StaticAnalysisAndroidPlugin.kt               | 7 +++----
 static_analysis_configs/detekt-config.yml                | 9 +++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
index 3611bcbd..f839c718 100644
--- a/gradle/plugins/build.gradle.kts
+++ b/gradle/plugins/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 // The kotlin-dsl plugin requires a repository to be declared
 repositories {
-    jcenter()
+    mavenCentral()
     google()
 }
 
@@ -15,7 +15,7 @@ dependencies {
     // android gradle plugin, required by custom plugin
     implementation("com.android.tools.build:gradle:4.0.1")
 
-    implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.10.0")
+    implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0")
     implementation("de.aaschmid:gradle-cpd-plugin:3.1")
 
     // kotlin plugin, required by custom plugin
diff --git a/gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt b/gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt
index 0aafb225..8664cd1e 100644
--- a/gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt
+++ b/gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt
@@ -43,11 +43,11 @@ class DetektLinter : Linter {
 
                     config.setFrom(project.files("${extension.buildScriptDir!!}/static_analysis_configs/detekt-config.yml"))
                     reports {
-                        txt.enabled = false
-                        html.enabled = false
+                        txt.required.set(false)
+                        html.required.set(false)
                         xml {
-                            enabled = true
-                            destination = project.getDetektReportFile()
+                            required.set(true)
+                            outputLocation.set(project.getDetektReportFile())
                         }
                     }
 
diff --git a/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisAndroidPlugin.kt b/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisAndroidPlugin.kt
index 423d1abb..d1d48617 100644
--- a/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisAndroidPlugin.kt
+++ b/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisAndroidPlugin.kt
@@ -4,9 +4,9 @@ import com.android.build.gradle.AppExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
 import static_analysis.linters.AndroidLinter
-import static_analysis.linters.CpdLinter
 import static_analysis.linters.DetektLinter
 import static_analysis.linters.Linter
+import java.util.Locale
 
 class StaticAnalysisAndroidPlugin : StaticAnalysisPlugin() {
 
@@ -17,19 +17,18 @@ class StaticAnalysisAndroidPlugin : StaticAnalysisPlugin() {
                 extensions.getByType<AppExtension>().apply {
                     applicationVariants.forEach { variant ->
                         project.tasks.register("staticAnalysis${variant.name.capitalize()}") {
-                            setupStaticAnalysisTask(linters, variant.name)
+                        setupStaticAnalysisTask(linters, variant.name)
                         }
                     }
 
                     project.tasks.register("staticAnalysis") {
                         setupStaticAnalysisTask(
                                 linters = linters,
-                                buildVariant = applicationVariants.first { it.name.contains("Debug") }.name
+                                buildVariant = applicationVariants.first { it.name.toLowerCase(Locale.ROOT).contains("debug") }.name
                         )
                     }
                 }
 
-
             }
         }
     }
diff --git a/static_analysis_configs/detekt-config.yml b/static_analysis_configs/detekt-config.yml
index 5ea4ccee..559b10c0 100644
--- a/static_analysis_configs/detekt-config.yml
+++ b/static_analysis_configs/detekt-config.yml
@@ -73,7 +73,8 @@ complexity:
     threshold: 40
   LongParameterList:
     active: true
-    threshold: 10
+    functionThreshold: 10
+    constructorThreshold: 10
     ignoreDefaultParameters: false
   MethodOverloading:
     active: false
@@ -268,7 +269,7 @@ potential-bugs:
     active: false
   LateinitUsage:
     active: false
-    excludeAnnotatedProperties: ""
+    ignoreAnnotated: []
     ignoreOnClassesPattern: ""
   UnconditionalJumpStatementInLoop:
     active: false
@@ -369,7 +370,7 @@ style:
     active: true
   UnnecessaryAbstractClass:
     active: false
-    excludeAnnotatedClasses: "dagger.Module"
+    ignoreAnnotated: ["dagger.Module"]
   UnnecessaryApply:
     active: true
   UnnecessaryInheritance:
@@ -389,7 +390,7 @@ style:
     allowedNames: "(_|ignored|expected|serialVersionUID)"
   UseDataClass:
     active: true
-    excludeAnnotatedClasses: ""
+    ignoreAnnotated: []
   UtilityClassWithPublicConstructor:
     active: false
   VarCouldBeVal: