Bump detekt version (#176)

* Bump gradle and kotlin Fixes issues #102 and #140. * Fixup detekt and ktlint configuration * Upgrade detekt and adapt some code to new rules * Fixup excludes
allegro · Oct 6, 2020 · 43d51f5 · 43d51f5
1 parent b10a8e9
commit 43d51f5
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 541 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ plugins {
     id 'org.jetbrains.kotlin.plugin.allopen' version '1.3.72'
     id "org.jlleitschuh.gradle.ktlint" version "9.4.0"
     id "org.jlleitschuh.gradle.ktlint-idea" version "9.4.0"
-    id "io.gitlab.arturbosch.detekt" version "1.0.0"
+    id "io.gitlab.arturbosch.detekt" version "1.13.1"
 }
 
 apply plugin: 'io.codearte.nexus-staging'
@@ -131,9 +131,10 @@ subprojects {
     }
 
     detekt {
-        toolVersion = "1.0.0"
+        toolVersion = "1.13.1"
         input = files("src/main/kotlin", "src/test/kotlin")
-        config = files("$rootDir/config/detekt/default-detekt-config.yml", "$rootDir/config/detekt/detekt-config.yml")
+        config = files("$rootDir/config/detekt/detekt.yml")
+        buildUponDefaultConfig = true
     }
 }