8000 Remove afterEvaluate wrapper v2 by 3flex · Pull Request #4271 · detekt/detekt · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Remove afterEvaluate wrapper v2 #4271

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 16, 2021
Merged

Remove afterEvaluate wrapper v2 #4271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08333c0
Register multiplatform tasks when new compilations are added
3flex Oct 4, 2021
a619d81
Remove afterEvaluate wrapper
3flex Oct 4, 2021
f0ab11a
Read Android Gradle boot classpath lazily
3flex Nov 15, 2021
5ae0155
Fix #4192 test
3flex Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 28 additions & 31 deletions detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,38 +67,35 @@ internal class DetektAndroid(private val project: Project) {
fun registerTasks(extension: DetektExtension) {
// There is not a single Android plugin, but each registers an extension based on BaseExtension,
// so we catch them all by looking for this one
project.afterEvaluate { evaluatedProject ->
val baseExtensionOrNull = evaluatedProject.extensions.findByType(BaseExtension::class.java)
baseExtensionOrNull?.let { baseExtension ->
val bootClasspath = evaluatedProject.files(baseExtension.bootClasspath)
baseExtension.variants
?.matching { !extension.matchesIgnoredConfiguration(it) }
?.all { variant ->
evaluatedProject.registerAndroidDetektTask(bootClasspath, extension, variant).also { provider ->
mainTaskProvider.dependsOn(provider)
}
evaluatedProject.registerAndroidCreateBaselineTask(bootClasspath, extension, variant)
.also { provider ->
mainBaselineTaskProvider.dependsOn(provider)
}
variant.testVariants
.filter { !extension.matchesIgnoredConfiguration(it) }
.forEach { testVariant ->
evaluatedProject.registerAndroidDetektTask(bootClasspath, extension, testVariant)
.also { provider ->
testTaskProvider.dependsOn(provider)
}
evaluatedProject.registerAndroidCreateBaselineTask(
bootClasspath,
extension,
testVariant
)
.also { provider ->
testBaselineTaskProvider.dependsOn(provider)
}
}
project.extensions.findByType(BaseExtension::class.java)?.let { baseExtension ->
val bootClasspath = project.files(project.provider { baseExtension.bootClasspath })
baseExtension.variants
?.matching { !extension.matchesIgnoredConfiguration(it) }
?.all { variant ->
project.registerAndroidDetektTask(bootClasspath, extension, variant).also { provider ->
mainTaskProvider.dependsOn(provider)
}
}
project.registerAndroidCreateBaselineTask(bootClasspath, extension, variant)
.also { provider ->
mainBaselineTaskProvider.dependsOn(provider)
}
variant.testVariants
.filter { !extension.matchesIgnoredConfiguration(it) }
.forEach { testVariant ->
project.registerAndroidDetektTask(bootClasspath, extension, testVariant)
.also { provider ->
testTaskProvider.dependsOn(provider)
}
project.registerAndroidCreateBaselineTask(
bootClasspath,
extension,
testVariant
)
.also { provider ->
testBaselineTaskProvider.dependsOn(provider)
}
}
}
}
}

Expand Down
8 changes: 3 additions & 5 deletions detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ import java.io.File

internal class DetektJvm(private val project: Project) {
fun registerTasks(extension: DetektExtension) {
project.afterEvaluate {
project.convention.getPlugin(JavaPluginConvention::class.java).sourceSets.all { sourceSet ->
project.registerJvmDetektTask(extension, sourceSet)
project.registerJvmCreateBaselineTask(extension, sourceSet)
}
project.convention.getPlugin(JavaPluginConvention::class.java).sourceSets.all { sourceSet ->
project.registerJvmDetektTask(extension, sourceSet)
project.registerJvmCreateBaselineTask(extension, sourceSet)
}
}

Expand Down
54 changes: 22 additions & 32 deletions ...gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektMultiplatform.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,30 @@ import java.io.File
internal class DetektMultiplatform(private val project: Project) {

fun registerTasks(extension: DetektExtension) {
project.afterEvaluate {
project.registerMultiplatformTasks(extension)
}
project.registerMultiplatformTasks(extension)
}

@Suppress("LongMethod")
private fun Project.registerMultiplatformTasks(extension: DetektExtension) {
// We need another project.afterEvaluate as the Android target is attached on
// a project.afterEvaluate inside AGP. We should further investigate and potentially remove this.
project.afterEvaluate { evaluatedProject ->
val kmpExtension = evaluatedProject.extensions.getByType(KotlinMultiplatformExtension::class.java)
project.extensions.getByType(KotlinMultiplatformExtension::class.java).targets.all { target ->
target.compilations.all { compilation ->
val inputSource = compilation.kotlinSourceSets
.map { it.kotlin.sourceDirectories }
.fold(project.files() as FileCollection) { collection, next -> collection.plus(next) }

kmpExtension.targets.all { target ->
target.compilations.forEach { compilation ->
val inputSource = compilation.kotlinSourceSets
.map { it.kotlin.sourceDirectories }
.fold(evaluatedProject.files() as FileCollection) { collection, next -> collection.plus(next) }

if (compilation is KotlinJvmAndroidCompilation) {
evaluatedProject.registerMultiplatformTasksForAndroidTarget(
compilation = compilation,
target = target,
extension = extension,
inputSource = inputSource
)
} else {
evaluatedProject.registerMultiplatformTasksForNonAndroidTarget(
compilation = compilation,
target = target,
extension = extension,
inputSource = inputSource
)
}
if (compilation is KotlinJvmAndroidCompilation) {
project.registerMultiplatformTasksForAndroidTarget(
compilation = compilation,
target = target,
extension = extension,
inputSource = inputSource
)
} else {
project.registerMultiplatformTasksForNonAndroidTarget(
compilation = compilation,
target = target,
extension = extension,
inputSource = inputSource
)
}
}
}
Expand All @@ -66,9 +57,8 @@ internal class DetektMultiplatform(private val project: Project) {
) {
// For Android targets we delegate to DetektAndroid as we need to access
// BaseVariant and other AGP apis to properly setup the classpath.
val androidExtension = extensions.findByType(BaseExtension::class.java)
androidExtension?.let {
val bootClasspath = files(it.bootClasspath)
extensions.findByType(BaseExtension::class.java)?.let {
val bootClasspath = files(provider { it.bootClasspath })
val variant = compilation.androidVariant
val detektTaskName = DetektPlugin.DETEKT_TASK_NAME +
target.name.capitalize() + variant.name.capitalize()
Expand Down
5 changes: 0 additions & 5 deletions detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package io.gitlab.arturbosch.detekt
import io.gitlab.arturbosch.detekt.invoke.CliArgument
import io.gitlab.arturbosch.detekt.testkit.DslGradleRunner
import io.gitlab.arturbosch.detekt.testkit.ProjectLayout
import io.gitlab.arturbosch.detekt.testkit.triggerEvaluation
import org.assertj.core.api.Assertions.assertThat
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.repositories
Expand Down Expand Up @@ -38,8 +37,6 @@ object DetektJvmSpec : Spek({
it("configures detekt type resolution task main") {
val project = gradleRunner.buildProject()

project.triggerEvaluation()

val detektTask = project.tasks.getByPath("detektMain") as Detekt
val argumentString = detektTask.arguments.flatMap(CliArgument::toArgument).joinToString(" ")

Expand All @@ -53,8 +50,6 @@ object DetektJvmSpec : Spek({
it("configures detekt type resolution task test") {
val project = gradleRunner.buildProject()

project.triggerEvaluation()

val detektTask = project.tasks.getByPath("detektTest") as Detekt
val argumentString = detektTask.arguments.flatMap(CliArgument::toArgument).joinToString(" ")

Expand Down
4 changes: 2 additions & 2 deletions detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ class ReportMergeSpec : Spek({
projectLayout.submodules.forEach {
assertThat(projectFile("${it.name}/build/reports/detekt/main.xml")).exists()
}
// #4192 this should exist by default
assertThat(projectFile("build/reports/detekt/merge.xml")).doesNotExist()

assertThat(projectFile("build/reports/detekt/merge.xml")).exists()
}
}

Expand Down
2 changes: 0 additions & 2 deletions ...dle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslGradleRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,3 @@ class DslGradleRunner @Suppress("LongParameterList") constructor(
private const val DETEKT_TASK = "detekt"
}
}

fun Project.triggerEvaluation() { this.getTasksByName("tasks", true) }
0