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

[JPS] Fix import for Kotlin Native

Browse Source 
(cherry picked from commit 049045e5fefba86221273f64b7fd0b3c5d1792d2)
This commit is contained in:
Aleksei.Cherepanov
2021-02-12 13:56:59 +03:00
committed by Stanislav Erokhin
parent f051119c4b
commit 710a6fb7f3
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/build.gradle.kts
+15 -8
View File
@@ -115,14 +115,16 @@ tasks.clean {
sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) {
kotlin.srcDir("src/main/kotlin") kotlin.srcDir("src/main/kotlin")
kotlin.srcDir("../kotlin-native/shared/src/library/kotlin") if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
kotlin.srcDir("../kotlin-native/shared/src/main/kotlin") kotlin.srcDir("../kotlin-native/shared/src/library/kotlin")
kotlin.srcDir("../kotlin-native/build-tools/src/main/kotlin") kotlin.srcDir("../kotlin-native/shared/src/main/kotlin")
kotlin.srcDir("../kotlin-native/build-tools/src/tmp/kotlin") kotlin.srcDir("../kotlin-native/build-tools/src/main/kotlin")
kotlin.srcDir("../kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin") kotlin.srcDir("../kotlin-native/build-tools/src/tmp/kotlin")
kotlin.srcDir("../compiler/util-klib/src") 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(project.kotlinNativeVersionSrc())
kotlin.srcDir("../native/utils/src")
kotlin.exclude("**/benchmark/SwiftBenchmarkingPlugin.kt") kotlin.exclude("**/benchmark/SwiftBenchmarkingPlugin.kt")
} }
@@ -171,6 +173,9 @@ dependencies {
implementation("io.ktor:ktor-client-cio:$ktorVersion") implementation("io.ktor:ktor-client-cio:$ktorVersion")
implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion") implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
implementation("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
}
} }
samWithReceiver { samWithReceiver {
@@ -196,7 +201,9 @@ tasks.withType<KotlinCompile>().configureEach {
tasks["build"].dependsOn(":prepare-deps:build") tasks["build"].dependsOn(":prepare-deps:build")
sourceSets["main"].withConvention(org.gradle.api.tasks.GroovySourceSet::class) { 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) { tasks.named("compileGroovy", GroovyCompile::class.java) {