diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt index 54d74c1c0ca..f9749ee82b4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt @@ -241,7 +241,7 @@ open class KotlinNativeTargetConfigurator : AbstractKotl project.syncLanguageSettingsToLinkTask(binary) } } - project.runOnceAfterEvaluated("Sync native compilation language settings to compiler options") { + project.launchInStage(KotlinPluginLifecycle.Stage.FinaliseCompilations) { target.compilations.all { compilation -> compilation.compilerOptions.syncLanguageSettings(compilation.defaultSourceSet.languageSettings) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt index 71cff59ee6c..e73f62b7ec1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt @@ -48,7 +48,7 @@ internal abstract class AbstractKotlinCompileConfig - project.runOnceAfterEvaluated("apply properties and language settings to ${taskProvider.name}") { + project.launchInStage(KotlinPluginLifecycle.Stage.AfterFinaliseCompilations) { taskProvider.configure { // KaptGenerateStubs will receive value from linked KotlinCompile task if (it is KaptGenerateStubsTask) return@configure