Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use plugin version as default Detekt version #1119

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -6,7 +6,7 @@ script:
- ./gradlew build -PwarningsAsErrors=true
- ./gradlew shadowJar
- java -jar ./detekt-cli/build/libs/detekt-cli-*-all.jar --help
- java -jar ./detekt-cli/build/libs/detekt-cli-*-all.jar -i . --baseline ./reports/baseline.xml -f ".*/resources/.*, .*/build/.*" -c ./detekt-cli/src/main/resources/default-detekt-config.yml,./reports/failfast.yml
- java -jar ./detekt-cli/build/libs/detekt-cli-*-all.jar -i . --baseline ./reports/baseline.xml -f ".*/resources/.*,.*/build/.*" -c ./detekt-cli/src/main/resources/default-detekt-config.yml,./reports/failfast.yml
- ./gradlew verifyGeneratorOutput
after_success:
- .buildscript/deploy_snapshot.sh
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -22,5 +22,5 @@ build_script:
- gradlew installShadowDist
- detekt-cli\build\install\detekt-cli-shadow\bin\detekt-cli --help
test_script:
- detekt-cli\build\install\detekt-cli-shadow\bin\detekt-cli -i . --baseline reports\baseline.xml -f ".*/resources/.*, .*/build/.*" -c detekt-cli\src\main\resources\default-detekt-config.yml,reports\failfast.yml
- detekt-cli\build\install\detekt-cli-shadow\bin\detekt-cli -i . --baseline reports\baseline.xml -f ".*/resources/.*,.*/build/.*" -c detekt-cli\src\main\resources\default-detekt-config.yml,reports\failfast.yml
- gradlew verifyGeneratorOutput
26 changes: 26 additions & 0 deletions detekt-gradle-plugin/build.gradle.kts
Expand Up @@ -123,6 +123,32 @@ tasks.withType(DokkaTask::class.java) {
outputDirectory = "$buildDir/javadoc"
}


val generateDefaultDetektVersionFile by tasks.creating {
val defaultDetektVersionFile =
File("$buildDir/generated/src/io/gitlab/arturbosch/detekt", "PluginVersion.kt")

outputs.file(defaultDetektVersionFile)

doFirst {
defaultDetektVersionFile.parentFile.mkdirs()
defaultDetektVersionFile.writeText("""
package io.gitlab.arturbosch.detekt

internal const val DEFAULT_DETEKT_VERSION = "$version"
"""
.trimIndent()
)
}
}

val mainJavaSourceSet: SourceDirectorySet = sourceSets.getByName("main").java
mainJavaSourceSet.srcDir("$buildDir/generated/src")

tasks.named("compileKotlin").configure {
dependsOn(generateDefaultDetektVersionFile)
}

val javaConvention = the<JavaPluginConvention>()
val sourcesJar by tasks.creating(Jar::class) {
dependsOn("classes")
Expand Down
Expand Up @@ -11,9 +11,7 @@ import java.io.File
*/
class DetektPlugin : Plugin<Project> {


override fun apply(project: Project) {

val extension = project.extensions.create(DETEKT, DetektExtension::class.java, project)

configurePluginDependencies(project, extension)
Expand Down Expand Up @@ -97,7 +95,6 @@ class DetektPlugin : Plugin<Project> {


companion object {
private const val DEFAULT_DETEKT_VERSION = "1.0.0.RC9"
private const val DETEKT = "detekt"
private const val IDEA_FORMAT = "detektIdeaFormat"
private const val IDEA_INSPECT = "detektIdeaInspect"
Expand Down