From 710a6fb7f386977f748aeafed0aa035f8564b009 Mon Sep 17 00:00:00 2001 From: "Aleksei.Cherepanov" Date: Fri, 12 Feb 2021 13:56:59 +0300 Subject: [PATCH] [JPS] Fix import for Kotlin Native (cherry picked from commit 049045e5fefba86221273f64b7fd0b3c5d1792d2) --- buildSrc/build.gradle.kts | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index db2238aacb0..264d1a49eb0 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -115,14 +115,16 @@ tasks.clean { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { kotlin.srcDir("src/main/kotlin") - kotlin.srcDir("../kotlin-native/shared/src/library/kotlin") - kotlin.srcDir("../kotlin-native/shared/src/main/kotlin") - kotlin.srcDir("../kotlin-native/build-tools/src/main/kotlin") - kotlin.srcDir("../kotlin-native/build-tools/src/tmp/kotlin") - kotlin.srcDir("../kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin") - kotlin.srcDir("../compiler/util-klib/src") + if (!kotlinBuildProperties.isInJpsBuildIdeaSync) { + kotlin.srcDir("../kotlin-native/shared/src/library/kotlin") + kotlin.srcDir("../kotlin-native/shared/src/main/kotlin") + kotlin.srcDir("../kotlin-native/build-tools/src/main/kotlin") + kotlin.srcDir("../kotlin-native/build-tools/src/tmp/kotlin") + kotlin.srcDir("../kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin") + kotlin.srcDir("../compiler/util-klib/src") + kotlin.srcDir("../native/utils/src") + } kotlin.srcDir(project.kotlinNativeVersionSrc()) - kotlin.srcDir("../native/utils/src") kotlin.exclude("**/benchmark/SwiftBenchmarkingPlugin.kt") } @@ -171,6 +173,9 @@ dependencies { implementation("io.ktor:ktor-client-cio:$ktorVersion") implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion") + if (kotlinBuildProperties.isInJpsBuildIdeaSync) { + implementation("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}") + } } samWithReceiver { @@ -196,7 +201,9 @@ tasks.withType().configureEach { tasks["build"].dependsOn(":prepare-deps:build") sourceSets["main"].withConvention(org.gradle.api.tasks.GroovySourceSet::class) { - groovy.srcDir("../kotlin-native/build-tools/src/main/groovy") + if (!kotlinBuildProperties.isInJpsBuildIdeaSync) { + groovy.srcDir("../kotlin-native/build-tools/src/main/groovy") + } } tasks.named("compileGroovy", GroovyCompile::class.java) {