From 55d18e8e6e3395f1a871146d896270a4261e314c Mon Sep 17 00:00:00 2001 From: Ekaterina Date: Tue, 12 Apr 2022 17:09:37 +0300 Subject: [PATCH 1/2] -- paging -- staticAnalysis --- .../main/java/static_analysis/plugins/StaticAnalysisPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisPlugin.kt b/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisPlugin.kt index 38ded005..f9298dff 100644 --- a/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisPlugin.kt +++ b/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisPlugin.kt @@ -26,7 +26,7 @@ abstract class StaticAnalysisPlugin : Plugin { val linters = createLinters() - afterEvaluate { + beforeEvaluate { linters.forEach { it.setupForProject(target, extensions.getByType()) } } From 876555fb19d5878dc0fb0f7c5aba15d3ecea7093 Mon Sep 17 00:00:00 2001 From: Kirill Nayduik Date: Fri, 15 Apr 2022 14:04:51 +0300 Subject: [PATCH 2/2] Update detekt version --- gradle/plugins/build.gradle.kts | 4 ++-- .../src/main/java/static_analysis/linters/DetektLinter.kt | 8 ++++---- .../plugins/StaticAnalysisAndroidPlugin.kt | 3 ++- 3 files changed, 8 insertions(+), 7 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 c433e816..9ae78f2a 100644 --- a/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisAndroidPlugin.kt +++ b/gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisAndroidPlugin.kt @@ -7,6 +7,7 @@ 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() { @@ -24,7 +25,7 @@ class StaticAnalysisAndroidPlugin : StaticAnalysisPlugin() { 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 ) } }