Skip to content
This repository has been archived by the owner on Jan 6, 2024. It is now read-only.

Commit

Permalink
Update to detekt 1.8.0 (#118)
Browse files Browse the repository at this point in the history
  • Loading branch information
arturbosch authored Apr 21, 2020
1 parent dd3d5ee commit 9e89e39
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#### 2.0.0

- Rename to sonar-detekt
- Based on detekt 1.7.4
- Based on detekt 1.8.0
- All redundant features to official SonarKotlin plugin got dropped
- Compatible with SonarKotlin, allows mixing rulesets

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.detekt</groupId>
<artifactId>sonar-detekt</artifactId>
<version>2.0.0-RC1</version>
<version>2.0.0</version>
<url>https://github.com/detekt/sonar-kotlin</url>

<licenses>
Expand All @@ -19,9 +19,9 @@
<packaging>sonar-plugin</packaging>

<properties>
<kotlin.version>1.3.71</kotlin.version>
<kotlin.version>1.3.72</kotlin.version>
<spek.version>2.0.10</spek.version>
<detekt.version>1.7.4</detekt.version>
<detekt.version>1.8.0</detekt.version>
<sonar.api.version>7.9.3</sonar.api.version>
<assertj.version>3.15.0</assertj.version>
<jcommander.version>1.78</jcommander.version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.gitlab.arturbosch.detekt.sonar.sensor

import io.gitlab.arturbosch.detekt.api.Config
import io.gitlab.arturbosch.detekt.api.internal.PathFilters
import io.gitlab.arturbosch.detekt.cli.CliArgs
import io.gitlab.arturbosch.detekt.cli.createFilters
import io.gitlab.arturbosch.detekt.cli.loadConfiguration
import io.gitlab.arturbosch.detekt.core.ProcessingSettings
import io.gitlab.arturbosch.detekt.sonar.foundation.CONFIG_PATH_KEY
Expand All @@ -16,8 +16,9 @@ import java.io.File
fun createProcessingSettings(context: SensorContext): ProcessingSettings {
val baseDir = context.fileSystem().baseDir()
val settings = context.config()
val pathFiltersString = settings.get(PATH_FILTERS_KEY).orElse(PATH_FILTERS_DEFAULTS)
val filters = PathFilters.of(null, pathFiltersString)
val filters = CliArgs {
excludes = settings.get(PATH_FILTERS_KEY).orElse(PATH_FILTERS_DEFAULTS)
}.createFilters()
val config = chooseConfig(baseDir, settings)
return ProcessingSettings(
inputPaths = listOf(baseDir.toPath()),
Expand Down

0 comments on commit 9e89e39

Please sign in to comment.