From ede5d3c90250e83551bbcb41d801aa974a913d47 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 18 Feb 2020 14:37:45 +0300 Subject: [PATCH] Detekt tasks config for each subproject --- gradle/commonStaticAnalysis.gradle | 2 +- gradle/staticAnalysis.gradle | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gradle/commonStaticAnalysis.gradle b/gradle/commonStaticAnalysis.gradle index e1468c0..b4d5c1d 100644 --- a/gradle/commonStaticAnalysis.gradle +++ b/gradle/commonStaticAnalysis.gradle @@ -207,7 +207,7 @@ getLintTask = { buildVariant -> return lintTaskPath } -getKotlinDetektTasks = { subprojects.collect { it.tasks.findByName("detekt").path }.findAll { !it.contains(":libs") } } +getKotlinDetektTasks = { subprojects.findResults { it.tasks.findByName("detekt")?.path }.findAll { !it.contains(":libs") } } task optimizePng { doFirst { diff --git a/gradle/staticAnalysis.gradle b/gradle/staticAnalysis.gradle index a9fcf8a..e384207 100644 --- a/gradle/staticAnalysis.gradle +++ b/gradle/staticAnalysis.gradle @@ -81,12 +81,16 @@ gradle.projectsEvaluated { } } - tasks.withType(io.gitlab.arturbosch.detekt.Detekt) { - exclude '**/test/' - exclude 'resources/' - exclude 'build/' - exclude 'tmp/' - jvmTarget = "1.8" + def regex = ~':detekt$' + tasks.forEach { task -> + if (!task.name.contains(":libs") && task.path =~ regex) { + task.exclude '**/test/**' + task.exclude 'resources/' + task.exclude 'build/' + task.exclude 'tmp/' + + task.jvmTarget = "1.8" + } } detekt {