diff --git a/detekt-cli/build.gradle.kts b/detekt-cli/build.gradle.kts index 282327a0d6a..1cd13b2caab 100644 --- a/detekt-cli/build.gradle.kts +++ b/detekt-cli/build.gradle.kts @@ -22,6 +22,7 @@ val pluginsJarFiles by configurations.resolvable("pluginsJarFiles") { dependencies { implementation(libs.jcommander) implementation(projects.detektTooling) + implementation(projects.detektUtils) implementation(libs.kotlin.compilerEmbeddable) { version { strictly(libs.versions.kotlin.get()) diff --git a/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/Spec.kt b/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/Spec.kt index 4a519a9129b..d77294f62f7 100644 --- a/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/Spec.kt +++ b/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/Spec.kt @@ -2,9 +2,9 @@ package io.gitlab.arturbosch.detekt.cli import io.github.detekt.tooling.api.spec.ProcessingSpec import io.github.detekt.tooling.api.spec.RulesSpec +import io.github.detekt.utils.PathFilters import io.gitlab.arturbosch.detekt.api.Rule import io.gitlab.arturbosch.detekt.api.RuleSet -import io.gitlab.arturbosch.detekt.api.internal.PathFilters import java.nio.file.Path import kotlin.io.path.ExperimentalPathApi import kotlin.io.path.absolute diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/ConfigExtensions.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/ConfigExtensions.kt index ef4f64b6166..6c409e23438 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/ConfigExtensions.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/ConfigExtensions.kt @@ -1,8 +1,8 @@ package io.gitlab.arturbosch.detekt.core.util import io.github.detekt.psi.absolutePath +import io.github.detekt.utils.PathFilters import io.gitlab.arturbosch.detekt.api.Config -import io.gitlab.arturbosch.detekt.api.internal.PathFilters import org.jetbrains.kotlin.psi.KtFile import java.nio.file.Path import kotlin.io.path.Path diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathFilters.kt b/detekt-utils/src/main/kotlin/io/github/detekt/utils/PathFilters.kt similarity index 96% rename from detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathFilters.kt rename to detekt-utils/src/main/kotlin/io/github/detekt/utils/PathFilters.kt index f3f2377fb91..52780df9658 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathFilters.kt +++ b/detekt-utils/src/main/kotlin/io/github/detekt/utils/PathFilters.kt @@ -1,4 +1,4 @@ -package io.gitlab.arturbosch.detekt.api.internal +package io.github.detekt.utils import java.nio.file.Path import java.nio.file.PathMatcher diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathMatchers.kt b/detekt-utils/src/main/kotlin/io/github/detekt/utils/PathMatchers.kt similarity index 88% rename from detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathMatchers.kt rename to detekt-utils/src/main/kotlin/io/github/detekt/utils/PathMatchers.kt index 0f25edad542..3ef0f86e01b 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathMatchers.kt +++ b/detekt-utils/src/main/kotlin/io/github/detekt/utils/PathMatchers.kt @@ -1,4 +1,4 @@ -package io.gitlab.arturbosch.detekt.api.internal +package io.github.detekt.utils import java.nio.file.FileSystem import java.nio.file.FileSystems @@ -9,7 +9,7 @@ import java.nio.file.PathMatcher * We only support the "glob:" syntax to stay os independently. * Internally a globbing pattern is transformed to a regex respecting the Windows file system. */ -fun pathMatcher(pattern: String): PathMatcher { +internal fun pathMatcher(pattern: String): PathMatcher { val result = when (pattern.substringBefore(":")) { "glob" -> pattern "regex" -> throw IllegalArgumentException(USE_GLOB_MSG) diff --git a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathFiltersSpec.kt b/detekt-utils/src/test/kotlin/io/github/detekt/utils/PathFiltersSpec.kt similarity index 97% rename from detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathFiltersSpec.kt rename to detekt-utils/src/test/kotlin/io/github/detekt/utils/PathFiltersSpec.kt index b571ed9499a..daac6111258 100644 --- a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathFiltersSpec.kt +++ b/detekt-utils/src/test/kotlin/io/github/detekt/utils/PathFiltersSpec.kt @@ -1,4 +1,4 @@ -package io.gitlab.arturbosch.detekt.api.internal +package io.github.detekt.utils import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathMatchersSpec.kt b/detekt-utils/src/test/kotlin/io/github/detekt/utils/PathMatchersSpec.kt similarity index 96% rename from detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathMatchersSpec.kt rename to detekt-utils/src/test/kotlin/io/github/detekt/utils/PathMatchersSpec.kt index 46d2669793f..d1925723c70 100644 --- a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/internal/PathMatchersSpec.kt +++ b/detekt-utils/src/test/kotlin/io/github/detekt/utils/PathMatchersSpec.kt @@ -1,4 +1,4 @@ -package io.gitlab.arturbosch.detekt.api.internal +package io.github.detekt.utils import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy