[stdlib-mpp] Disable sources for IDEA sync in conflicting projects
#KT-56106
This commit is contained in:
committed by
Space Team
parent
46cee9d0a3
commit
9ed6574979
@@ -13,6 +13,7 @@ def commonTestSrcDir = "../test"
|
|||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir 'src'
|
srcDir 'src'
|
||||||
srcDir commonSrcDir
|
srcDir commonSrcDir
|
||||||
@@ -23,6 +24,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
test {
|
test {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir commonTestSrcDir
|
srcDir commonTestSrcDir
|
||||||
srcDir 'test'
|
srcDir 'test'
|
||||||
|
|||||||
@@ -118,8 +118,11 @@ kotlin {
|
|||||||
}
|
}
|
||||||
named("jsMain") {
|
named("jsMain") {
|
||||||
kotlin.srcDir(files(jsMainSources.map { it.destinationDir }))
|
kotlin.srcDir(files(jsMainSources.map { it.destinationDir }))
|
||||||
|
if (!kotlinBuildProperties.isInIdeaSync)
|
||||||
kotlin.srcDir("builtins")
|
kotlin.srcDir("builtins")
|
||||||
|
if (!kotlinBuildProperties.isInIdeaSync)
|
||||||
kotlin.srcDir("runtime")
|
kotlin.srcDir("runtime")
|
||||||
|
if (!kotlinBuildProperties.isInIdeaSync)
|
||||||
kotlin.srcDir("src")
|
kotlin.srcDir("src")
|
||||||
}
|
}
|
||||||
named("commonTest") {
|
named("commonTest") {
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ def kotlinTestJsTestOutputFile = "${project(':kotlin-test:kotlin-test-js').build
|
|||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
builtins {
|
builtins {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir builtinsSrcDir2
|
srcDir builtinsSrcDir2
|
||||||
srcDir "${jsCommonDir}/runtime"
|
srcDir "${jsCommonDir}/runtime"
|
||||||
@@ -50,6 +51,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
main {
|
main {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir builtinsSrcDir
|
srcDir builtinsSrcDir
|
||||||
srcDir jsCommonSrcDir
|
srcDir jsCommonSrcDir
|
||||||
@@ -58,6 +60,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir jsTestSrcDir
|
srcDir jsTestSrcDir
|
||||||
srcDir jsCommonTestSrcDir
|
srcDir jsCommonTestSrcDir
|
||||||
|
|||||||
@@ -18,11 +18,13 @@ configurations {
|
|||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
compileOnlyDeclarations {
|
compileOnlyDeclarations {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
java {
|
java {
|
||||||
srcDir 'compileOnly'
|
srcDir 'compileOnly'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
main {
|
main {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
java {
|
java {
|
||||||
srcDir "${rootDir}/core/builtins/src"
|
srcDir "${rootDir}/core/builtins/src"
|
||||||
srcDir 'runtime'
|
srcDir 'runtime'
|
||||||
@@ -30,16 +32,19 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
mainJdk7 {
|
mainJdk7 {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir '../jdk7/src'
|
srcDir '../jdk7/src'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mainJdk8 {
|
mainJdk8 {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir '../jdk8/src'
|
srcDir '../jdk8/src'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
test {
|
test {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir 'test'
|
srcDir 'test'
|
||||||
srcDir '../jdk7/test'
|
srcDir '../jdk7/test'
|
||||||
@@ -47,11 +52,13 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
longRunningTest {
|
longRunningTest {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
kotlin {
|
kotlin {
|
||||||
srcDir 'testLongRunning'
|
srcDir 'testLongRunning'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
java9 {
|
java9 {
|
||||||
|
if (!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync)
|
||||||
java {
|
java {
|
||||||
srcDir 'java9'
|
srcDir 'java9'
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user