diff --git a/build.gradle b/build.gradle index 8e578d7d..e0e1be55 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.intellij' version '0.4.9' apply(false) id 'org.jmailen.kotlinter' version '1.16.0' apply(false) id 'org.sonarqube' version '2.6.2' - id "io.gitlab.arturbosch.detekt" version "1.0.0.RC8" + id "io.gitlab.arturbosch.detekt" version '1.0.0-RC16' } allprojects { @@ -26,7 +26,7 @@ gradle.projectsEvaluated { task check { def deps = [] deps += getTasksByName("check", true).findAll { it.project != rootProject } - deps += detektCheck + deps += "detekt" deps += jacocoReport dependsOn(deps) diff --git a/gradle/code-quality.gradle b/gradle/code-quality.gradle index 2dfdb911..0587c58a 100644 --- a/gradle/code-quality.gradle +++ b/gradle/code-quality.gradle @@ -1,21 +1,15 @@ def detektAggregateReport = "$buildDir/reports/detekt-report.xml" -detekt { - version = detektVersion - - profile("main") { - input = rootProject.projectDir.absolutePath - filters = ".*/resources/.*, .*/build/.*" - output = file("$buildDir/reports") - outputName = "detekt-report" - config = file("$rootDir/gradle/config/detekt.yml") - parallel = true - } +repositories { + maven { url "https://repo.spring.io/plugins-release/" } } -dependencies { - detekt group: 'io.gitlab.arturbosch.detekt', name: 'detekt-formatting', version: detektVersion - detekt project(':game:plugin-detekt-rules') +detekt { + toolVersion = detektVersion + input = files(rootProject.projectDir.absolutePath) + filters = ".*/resources/.*, .*/build/.*" + config = files("$rootDir/gradle/config/detekt.yml") + parallel = true } sonarqube {