azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore scripting-ide-services testing, fix coroutines dependency

Browse Source
This commit is contained in:
Ilya Chernikov
2021-07-23 18:03:17 +02:00
committed by TeamCityServer
parent 173813f7cf
commit df9a3c0300
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+2
View File
@@ -730,6 +730,8 @@ tasks {
dependsOn(":kotlin-scripting-jsr223-test:embeddableTest") dependsOn(":kotlin-scripting-jsr223-test:embeddableTest")
dependsOn(":kotlin-main-kts-test:test") dependsOn(":kotlin-main-kts-test:test")
dependsOn(":kotlin-main-kts-test:testWithIr") dependsOn(":kotlin-main-kts-test:testWithIr")
dependsOn(":kotlin-scripting-ide-services-test:test")
dependsOn(":kotlin-scripting-ide-services-test:embeddableTest")
dependsOn(":kotlin-scripting-js-test:test") dependsOn(":kotlin-scripting-js-test:test")
} }
plugins/scripting/scripting-ide-services-test/build.gradle.kts
+4
View File
@@ -24,6 +24,8 @@ dependencies {
testCompile(project(":kotlin-scripting-dependencies-maven")) testCompile(project(":kotlin-scripting-dependencies-maven"))
testCompile(project(":compiler:cli")) testCompile(project(":compiler:cli"))
testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
testRuntimeOnly(project(":kotlin-compiler")) testRuntimeOnly(project(":kotlin-compiler"))
testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j")) testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
testRuntimeOnly(project(":kotlin-scripting-ide-common")) { isTransitive = false } testRuntimeOnly(project(":kotlin-scripting-ide-common")) { isTransitive = false }
@@ -34,6 +36,8 @@ dependencies {
embeddableTestRuntime(project(":kotlin-scripting-dependencies-maven-all")) embeddableTestRuntime(project(":kotlin-scripting-dependencies-maven-all"))
embeddableTestRuntime(kotlinStdlib("jdk8")) embeddableTestRuntime(kotlinStdlib("jdk8"))
embeddableTestRuntime(testSourceSet.output) embeddableTestRuntime(testSourceSet.output)
embeddableTestRuntime(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
embeddableTestRuntime(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
} }
sourceSets { sourceSets {