azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Commonizer] Call commonizer on Gradle configuration phase

Browse Source 
Issue #KT-36858

Initially it was called on execution step which may be omit
during project import into IDEA.
This commit is contained in:
Dmitriy Dolovov
2020-02-21 15:46:08 +07:00
parent f2f95496e3
commit d76dc6f57e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
+8 -4
View File
@@ -9,7 +9,9 @@
package org.jetbrains.kotlin.gradle.plugin.mpp package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.BuildAdapter
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.invocation.Gradle
import org.jetbrains.kotlin.compilerRunner.konanHome import org.jetbrains.kotlin.compilerRunner.konanHome
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
@@ -69,10 +71,12 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
createTargetConfigurator().configureTarget(result) createTargetConfigurator().configureTarget(result)
project.gradle.taskGraph.whenReady { SingleActionPerProject.run(project, "setUpKotlinNativePlatformDependencies") {
SingleActionPerProject.run(project, "setUpKotlinNativePlatformDependencies") { project.gradle.addListener(object : BuildAdapter() {
project.setUpKotlinNativePlatformDependencies() override fun projectsEvaluated(gradle: Gradle) {
} project.setUpKotlinNativePlatformDependencies()
}
})
} }
if (!konanTarget.enabledOnCurrentHost) { if (!konanTarget.enabledOnCurrentHost) {