From 4eaabe54ee8e5b3dddc4e0b3510cf809a6ba8b48 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 28 Sep 2021 08:59:41 +0200 Subject: [PATCH] [Gradle] Finalize naming of 'runProjectConfigurationHealthCheckWhenEvaluated' API ^KT-48823 --- .../kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt | 2 +- .../kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt | 4 ++-- .../kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt | 2 +- .../org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt | 2 +- .../kotlin/gradle/targets/js/KotlinJsTargetPreset.kt | 4 ++-- .../kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt | 4 ++-- ...gurationCheck.kt => runProjectConfigurationHealthCheck.kt} | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/{runProjectConfigurationCheck.kt => runProjectConfigurationHealthCheck.kt} (94%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt index c89a84000c0..e1cf124ca0c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt @@ -227,7 +227,7 @@ class KotlinMultiplatformPlugin : Plugin { UnusedSourceSetsChecker.checkSourceSets(project) - project.runPostEvaluationProjectConfigurationHealthCheck { + project.runProjectConfigurationHealthCheckWhenEvaluated { checkSourceSetVisibilityRequirements(project) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt index 6028e62ccba..6265bda8302 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.FragmentConsistencyChecker import org.jetbrains.kotlin.gradle.plugin.sources.FragmentConsistencyChecks import org.jetbrains.kotlin.gradle.utils.addExtendsFromRelation import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName -import org.jetbrains.kotlin.gradle.utils.runPostEvaluationProjectConfigurationHealthCheck +import org.jetbrains.kotlin.gradle.utils.runProjectConfigurationHealthCheckWhenEvaluated import org.jetbrains.kotlin.project.model.KotlinModuleDependency import org.jetbrains.kotlin.project.model.KotlinModuleFragment import org.jetbrains.kotlin.project.model.refinesClosure @@ -56,7 +56,7 @@ open class KotlinGradleFragmentInternal @Inject constructor( project.addExtendsFromRelation(getConfiguration(this), getConfiguration(other.get())) // todo eager instantiation; fix? } - project.runPostEvaluationProjectConfigurationHealthCheck { + project.runProjectConfigurationHealthCheckWhenEvaluated { kotlinGradleFragmentConsistencyChecker.runAllChecks(this@KotlinGradleFragmentInternal, other.get()) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt index 8b0e048839b..94d8e31a0bf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt @@ -92,7 +92,7 @@ class DefaultKotlinSourceSet( // Fail-fast approach: check on each new added edge and report a circular dependency at once when the edge is added. checkForCircularDependencies() - project.runPostEvaluationProjectConfigurationHealthCheck { + project.runProjectConfigurationHealthCheckWhenEvaluated { defaultSourceSetLanguageSettingsChecker.runAllChecks(this@DefaultKotlinSourceSet, other) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt index 2204ac30c3f..8848f292cda 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt @@ -46,7 +46,7 @@ open class KotlinJsPlugin( defaultJsCompilerType = PropertiesProvider(project).jsCompiler } - project.runPostEvaluationProjectConfigurationHealthCheck { + project.runProjectConfigurationHealthCheckWhenEvaluated { if (kotlinExtension._target == null) { project.logger.warn( """ diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt index 26c16cba7a9..a37c10b49f8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTargetConfigurator import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName -import org.jetbrains.kotlin.gradle.utils.runPostEvaluationProjectConfigurationHealthCheck +import org.jetbrains.kotlin.gradle.utils.runProjectConfigurationHealthCheckWhenEvaluated import org.jetbrains.kotlin.statistics.metrics.StringMetrics open class KotlinJsTargetPreset( @@ -55,7 +55,7 @@ open class KotlinJsTargetPreset( } this.isMpp = this@KotlinJsTargetPreset.isMpp - project.runPostEvaluationProjectConfigurationHealthCheck { + project.runProjectConfigurationHealthCheckWhenEvaluated { if (!isBrowserConfigured && !isNodejsConfigured) { project.logger.warn( """ diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt index 159eb8b9b7b..2933aa08948 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTargetPreset import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName -import org.jetbrains.kotlin.gradle.utils.runPostEvaluationProjectConfigurationHealthCheck +import org.jetbrains.kotlin.gradle.utils.runProjectConfigurationHealthCheckWhenEvaluated import org.jetbrains.kotlin.statistics.metrics.StringMetrics open class KotlinJsIrTargetPreset( @@ -32,7 +32,7 @@ open class KotlinJsIrTargetPreset( return project.objects.newInstance(KotlinJsIrTarget::class.java, project, platformType, mixedMode).apply { this.isMpp = this@KotlinJsIrTargetPreset.isMpp if (!mixedMode) { - project.runPostEvaluationProjectConfigurationHealthCheck { + project.runProjectConfigurationHealthCheckWhenEvaluated { if (!isBrowserConfigured && !isNodejsConfigured) { project.logger.warn( """ diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/runProjectConfigurationCheck.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/runProjectConfigurationHealthCheck.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/runProjectConfigurationCheck.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/runProjectConfigurationHealthCheck.kt index afabf4b33aa..aba3b523176 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/runProjectConfigurationCheck.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/runProjectConfigurationHealthCheck.kt @@ -74,8 +74,8 @@ internal inline fun Project.runProjectConfigurationHealthCheck(check: Project.() * ``` * @see runProjectConfigurationHealthCheck */ -internal inline fun Project.runPostEvaluationProjectConfigurationHealthCheck(crossinline action: Project.() -> Unit) { +internal inline fun Project.runProjectConfigurationHealthCheckWhenEvaluated(crossinline check: Project.() -> Unit) { whenEvaluated { - runProjectConfigurationHealthCheck(action) + runProjectConfigurationHealthCheck(check) } }