From d25b07fe237b2e2ecdd8b7dd55693e481a2adc31 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 7 Mar 2017 12:45:45 +0300 Subject: [PATCH] Exclude additional test source sets when importing project in IDEA, enable coroutines in stdlib --- libraries/stdlib/build.gradle | 2 ++ libraries/stdlib/jre7/build.gradle | 6 +++++- libraries/stdlib/jre8/build.gradle | 8 ++++++-- libraries/tools/runtime/build.gradle | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/libraries/stdlib/build.gradle b/libraries/stdlib/build.gradle index 8952f201f01..34d5b078ef3 100644 --- a/libraries/stdlib/build.gradle +++ b/libraries/stdlib/build.gradle @@ -80,3 +80,5 @@ compileKotlin { ] } } + +kotlin.experimental.coroutines 'enable' diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle index 96ae7f8e641..5418228b39a 100644 --- a/libraries/stdlib/jre7/build.gradle +++ b/libraries/stdlib/jre7/build.gradle @@ -15,7 +15,9 @@ sourceSets { test { kotlin { srcDir 'test' - srcDir '../test' + if(!System.properties.'idea.active') { + srcDir '../test' + } } } } @@ -44,6 +46,8 @@ compileTestKotlin { kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] } +kotlin.experimental.coroutines 'enable' + test { executable = "$JDK_17/bin/java" } diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle index e7fcb3a5bf0..fc579d16fa3 100644 --- a/libraries/stdlib/jre8/build.gradle +++ b/libraries/stdlib/jre8/build.gradle @@ -15,8 +15,10 @@ sourceSets { test { kotlin { srcDir 'test' - srcDir '../test' - srcDir '../jre7/test' + if(!System.properties.'idea.active') { + srcDir '../test' + srcDir '../jre7/test' + } } } } @@ -47,6 +49,8 @@ compileTestKotlin { kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] } +kotlin.experimental.coroutines 'enable' + test { executable = "$JDK_18/bin/java" } diff --git a/libraries/tools/runtime/build.gradle b/libraries/tools/runtime/build.gradle index 7c60e78191f..dbb89e820f6 100644 --- a/libraries/tools/runtime/build.gradle +++ b/libraries/tools/runtime/build.gradle @@ -6,6 +6,7 @@ dependencies { } sourceSets { + if(!System.properties.'idea.active') main { java { srcDir "${rootDir}/../core/builtins/src"