Exclude additional test source sets when importing project in IDEA, enable coroutines in stdlib

This commit is contained in:
Ilya Gorbunov
2017-03-07 12:45:45 +03:00
parent 08fa304b6f
commit d25b07fe23
4 changed files with 14 additions and 3 deletions
+2
View File
@@ -80,3 +80,5 @@ compileKotlin {
] ]
} }
} }
kotlin.experimental.coroutines 'enable'
+5 -1
View File
@@ -15,7 +15,9 @@ sourceSets {
test { test {
kotlin { kotlin {
srcDir 'test' srcDir 'test'
srcDir '../test' if(!System.properties.'idea.active') {
srcDir '../test'
}
} }
} }
} }
@@ -44,6 +46,8 @@ compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
} }
kotlin.experimental.coroutines 'enable'
test { test {
executable = "$JDK_17/bin/java" executable = "$JDK_17/bin/java"
} }
+6 -2
View File
@@ -15,8 +15,10 @@ sourceSets {
test { test {
kotlin { kotlin {
srcDir 'test' srcDir 'test'
srcDir '../test' if(!System.properties.'idea.active') {
srcDir '../jre7/test' srcDir '../test'
srcDir '../jre7/test'
}
} }
} }
} }
@@ -47,6 +49,8 @@ compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
} }
kotlin.experimental.coroutines 'enable'
test { test {
executable = "$JDK_18/bin/java" executable = "$JDK_18/bin/java"
} }
+1
View File
@@ -6,6 +6,7 @@ dependencies {
} }
sourceSets { sourceSets {
if(!System.properties.'idea.active')
main { main {
java { java {
srcDir "${rootDir}/../core/builtins/src" srcDir "${rootDir}/../core/builtins/src"