diff --git a/build.gradle.kts b/build.gradle.kts index 812637d..486673a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,6 @@ plugins { detekt { debug = true isEnabled = System.getProperty("selfAnalysis") != null - buildUponDefaultConfig = true } repositories { diff --git a/src/main/kotlin/io/github/detekt/gradle/extensions/DetektExtension.kt b/src/main/kotlin/io/github/detekt/gradle/extensions/DetektExtension.kt index b97df67..83c03b1 100644 --- a/src/main/kotlin/io/github/detekt/gradle/extensions/DetektExtension.kt +++ b/src/main/kotlin/io/github/detekt/gradle/extensions/DetektExtension.kt @@ -9,6 +9,15 @@ import java.io.File open class DetektExtension(project: Project) : CodeQualityExtension() { var isEnabled: Boolean = true + var baseline: File? = null + var debug: Boolean = false + var parallel: Boolean = false + var failFast: Boolean = false + var buildUponDefaultConfig: Boolean = true + var disableDefaultRuleSets: Boolean = false + var autoCorrect: Boolean = false + + var config: ConfigurableFileCollection = project.objects.fileCollection() var ignoreFailures: Boolean @JvmName("ignoreFailures_") @@ -21,35 +30,4 @@ open class DetektExtension(project: Project) : CodeQualityExtension() { val reports = DetektReports() fun reports(configure: Action) = configure.execute(reports) - - var input: ConfigurableFileCollection = - project.objects.fileCollection().from(DEFAULT_SRC_DIR_JAVA, DEFAULT_SRC_DIR_KOTLIN) - - var baseline: File? = null - - var config: ConfigurableFileCollection = project.objects.fileCollection() - - var debug: Boolean = DEFAULT_DEBUG_VALUE - - var parallel: Boolean = DEFAULT_PARALLEL_VALUE - - var failFast: Boolean = DEFAULT_FAIL_FAST_VALUE - - var buildUponDefaultConfig: Boolean = DEFAULT_BUILD_UPON_DEFAULT_CONFIG_VALUE - - var disableDefaultRuleSets: Boolean = DEFAULT_DISABLE_RULESETS_VALUE - - var autoCorrect: Boolean = DEFAULT_AUTO_CORRECT_VALUE - - companion object { - const val DEFAULT_SRC_DIR_JAVA = "src/main/java" - const val DEFAULT_SRC_DIR_KOTLIN = "src/main/kotlin" - const val DEFAULT_DEBUG_VALUE = false - const val DEFAULT_PARALLEL_VALUE = false - const val DEFAULT_AUTO_CORRECT_VALUE = false - const val DEFAULT_DISABLE_RULESETS_VALUE = false - const val DEFAULT_REPORT_ENABLED_VALUE = true - const val DEFAULT_FAIL_FAST_VALUE = false - const val DEFAULT_BUILD_UPON_DEFAULT_CONFIG_VALUE = false - } }