From 50f4531c77f9b5763b0a2e7627f8d70ee04a31f6 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 15 Mar 2023 13:51:05 +0100 Subject: [PATCH] [Gradle] UnusedSourceSetsChecker: Use lifecycle instead of whenEvaluated ^KT-34662 Verification Pending --- .../kotlin/gradle/plugin/mpp/UnusedSourceSetsChecker.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/UnusedSourceSetsChecker.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/UnusedSourceSetsChecker.kt index 6b918335d7d..9a2b5ef1e0d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/UnusedSourceSetsChecker.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/UnusedSourceSetsChecker.kt @@ -7,11 +7,11 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.Project import org.jetbrains.kotlin.gradle.dsl.kotlinExtension -import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet -import org.jetbrains.kotlin.gradle.plugin.extraProperties +import org.jetbrains.kotlin.gradle.plugin.* +import org.jetbrains.kotlin.gradle.plugin.KotlinPluginLifecycle +import org.jetbrains.kotlin.gradle.plugin.launchInStage import org.jetbrains.kotlin.gradle.plugin.sources.android.androidSourceSetInfoOrNull import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.plugin.whenEvaluated object UnusedSourceSetsChecker { const val WARNING_PREFIX_ONE = @@ -39,7 +39,7 @@ object UnusedSourceSetsChecker { } fun checkSourceSets(project: Project) { - project.whenEvaluated { + project.launchInStage(KotlinPluginLifecycle.Stage.ReadyForExecution) { val unusedSourceSets = project.kotlinExtension.sourceSets // Ignoring Android source sets .filter { it.androidSourceSetInfoOrNull == null }