From d7122bc52a72451ec5ed98dd2420bd775f16191e Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 10 Feb 2022 11:50:48 +0100 Subject: [PATCH] Move kotlinGradleFragmentConsistencyChecker to be a part of class Fixes 'NoSuchMethodException' on running 'KpmCompilerPluginIT.testTransientPluginOptions' test. ^KT-49227 In Progress --- .../build.gradle.kts | 2 +- .../plugin/mpp/pm20/KotlinGradleFragment.kt | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts index 48d77b0aac3..6f01802957d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts @@ -7,8 +7,8 @@ plugins { } repositories { - mavenCentral() mavenLocal() + mavenCentral() } plugins.apply(GradleKpmPluginWithTransientPluginOptions::class.java) 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 4ac2b06a6eb..0606d77476f 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 @@ -105,17 +105,17 @@ open class KotlinGradleFragmentInternal @Inject constructor( ) override fun toString(): String = "fragment $fragmentName in $containingModule" + + private val kotlinGradleFragmentConsistencyChecker = + FragmentConsistencyChecker( + unitsName = "fragments", + name = { name }, + checks = FragmentConsistencyChecks( + unitName = "fragment", + languageSettings = { languageSettings } + ).allChecks + ) } val KotlinGradleFragment.refinesClosure: Set get() = (this as KotlinModuleFragment).refinesClosure.map { it as KotlinGradleFragment }.toSet() - -internal val kotlinGradleFragmentConsistencyChecker = - FragmentConsistencyChecker( - unitsName = "fragments", - name = { name }, - checks = FragmentConsistencyChecks( - unitName = "fragment", - languageSettings = { languageSettings } - ).allChecks - )