diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle index 75fe791eab9..384ec09ee9a 100644 --- a/libraries/stdlib/common/build.gradle +++ b/libraries/stdlib/common/build.gradle @@ -13,6 +13,7 @@ def commonTestSrcDir = "../test" sourceSets { main { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir 'src' srcDir commonSrcDir @@ -23,6 +24,7 @@ sourceSets { } } test { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir commonTestSrcDir srcDir 'test' diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index 3e36db56abd..5179bf2e707 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -118,8 +118,11 @@ kotlin { } named("jsMain") { kotlin.srcDir(files(jsMainSources.map { it.destinationDir })) + if (!kotlinBuildProperties.isInIdeaSync) kotlin.srcDir("builtins") + if (!kotlinBuildProperties.isInIdeaSync) kotlin.srcDir("runtime") + if (!kotlinBuildProperties.isInIdeaSync) kotlin.srcDir("src") } named("commonTest") { diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle index 26cd2919d2a..023cba3f3e6 100644 --- a/libraries/stdlib/js-v1/build.gradle +++ b/libraries/stdlib/js-v1/build.gradle @@ -42,6 +42,7 @@ def kotlinTestJsTestOutputFile = "${project(':kotlin-test:kotlin-test-js').build sourceSets { builtins { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir builtinsSrcDir2 srcDir "${jsCommonDir}/runtime" @@ -50,6 +51,7 @@ sourceSets { } main { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir builtinsSrcDir srcDir jsCommonSrcDir @@ -58,6 +60,7 @@ sourceSets { } test { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir jsTestSrcDir srcDir jsCommonTestSrcDir diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index 305140cb75a..72520e4d5b9 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -18,11 +18,13 @@ configurations { sourceSets { compileOnlyDeclarations { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) java { srcDir 'compileOnly' } } main { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) java { srcDir "${rootDir}/core/builtins/src" srcDir 'runtime' @@ -30,16 +32,19 @@ sourceSets { } } mainJdk7 { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir '../jdk7/src' } } mainJdk8 { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir '../jdk8/src' } } test { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir 'test' srcDir '../jdk7/test' @@ -47,11 +52,13 @@ sourceSets { } } longRunningTest { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) kotlin { srcDir 'testLongRunning' } } java9 { + if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) java { srcDir 'java9' }