[stdlib-mpp] Disable sources for IDEA sync in conflicting projects

#KT-56106
This commit is contained in:
Ilya Gorbunov
2022-02-16 05:50:22 +03:00
committed by Space Team
parent 46cee9d0a3
commit 9ed6574979
4 changed files with 15 additions and 0 deletions
+2
View File
@@ -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'
+3
View File
@@ -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") {
+3
View File
@@ -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
+7
View File
@@ -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'
}