From d76dc6f57e2b7f75bfd55a9069c2fae1c8b34fdf Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 21 Feb 2020 15:46:08 +0700
Subject: [PATCH] [Commonizer] Call commonizer on Gradle configuration phase

Issue #KT-36858

Initially it was called on execution step which may be omit
during project import into IDEA.
---
 .../targets/native/KotlinNativeTargetPreset.kt       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
index 1505c80adc7..ce2385561d0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
@@ -9,7 +9,9 @@
 
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
+import org.gradle.BuildAdapter
 import org.gradle.api.Project
+import org.gradle.api.invocation.Gradle
 import org.jetbrains.kotlin.compilerRunner.konanHome
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
@@ -69,10 +71,12 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
 
         createTargetConfigurator().configureTarget(result)
 
-        project.gradle.taskGraph.whenReady {
-            SingleActionPerProject.run(project, "setUpKotlinNativePlatformDependencies") {
-                project.setUpKotlinNativePlatformDependencies()
-            }
+        SingleActionPerProject.run(project, "setUpKotlinNativePlatformDependencies") {
+            project.gradle.addListener(object : BuildAdapter() {
+                override fun projectsEvaluated(gradle: Gradle) {
+                    project.setUpKotlinNativePlatformDependencies()
+                }
+            })
         }
 
         if (!konanTarget.enabledOnCurrentHost) {