Skip to content

Updated detekt version and config #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mlpozdeev wants to merge 1 commit into
base: build_scripts_ubrr_android/disabled_cpd
Choose a base branch
from
Open

Updated detekt version and config #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle/plugins/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ plugins {

// The kotlin-dsl plugin requires a repository to be declared
repositories {
jcenter()
mavenCentral()
google()
}

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
Expand Down
8 changes: 4 additions & 4 deletions gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
}

Expand Down
7 changes: 3 additions & 4 deletions gradle/plugins/src/main/java/static_analysis/plugins/StaticAnalysisAndroidPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand All @@ -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
)
}
}


}
}
}
Expand Down
9 changes: 5 additions & 4 deletions static_analysis_configs/detekt-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ complexity:
threshold: 40
LongParameterList:
active: true
threshold: 10
functionThreshold: 10
constructorThreshold: 10
ignoreDefaultParameters: false
MethodOverloading:
active: false
Expand Down Expand Up @@ -268,7 +269,7 @@ potential-bugs:
active: false
LateinitUsage:
active: false
excludeAnnotatedProperties: ""
ignoreAnnotated: []
ignoreOnClassesPattern: ""
UnconditionalJumpStatementInLoop:
active: false
Expand Down Expand Up @@ -369,7 +370,7 @@ style:
active: true
UnnecessaryAbstractClass:
active: false
excludeAnnotatedClasses: "dagger.Module"
ignoreAnnotated: ["dagger.Module"]
UnnecessaryApply:
active: true
UnnecessaryInheritance:
Expand All @@ -389,7 +390,7 @@ style:
allowedNames: "(_|ignored|expected|serialVersionUID)"
UseDataClass:
active: true
excludeAnnotatedClasses: ""
ignoreAnnotated: []
UtilityClassWithPublicConstructor:
active: false
VarCouldBeVal:
Expand Down