Remove new kotlin daemon from dist
hopefully temporarily, also see #KTI-173
This commit is contained in:
@@ -24,15 +24,9 @@ dependencies {
|
||||
runtime(project(":kotlin-reflect"))
|
||||
|
||||
embedded(project(":daemon-common")) { isTransitive = false }
|
||||
embedded(project(":daemon-common-new")) { isTransitive = false }
|
||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||
isTransitive = false
|
||||
}
|
||||
compile(commonDep("io.ktor", "ktor-network")) {
|
||||
ktorExcludesForDaemon.forEach { (group, module) ->
|
||||
exclude(group = group, module = module)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
+1
-2
@@ -76,8 +76,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
|
||||
|
||||
val compilerClassPath = listOf(
|
||||
File(compilerLibDir, "kotlin-compiler.jar"),
|
||||
File(compilerLibDir, "kotlin-daemon.jar"),
|
||||
File(compilerLibDir, "ktor-network-1.0.1.jar")
|
||||
File(compilerLibDir, "kotlin-daemon.jar")
|
||||
)
|
||||
val scriptRuntimeClassPath = listOf(
|
||||
File(compilerLibDir, "kotlin-runtime.jar"),
|
||||
|
||||
+2
-3
@@ -97,9 +97,8 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
|
||||
)
|
||||
|
||||
val daemonClientClassPath = listOf(
|
||||
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client-new.jar"),
|
||||
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"),
|
||||
File(KotlinIntegrationTestBase.getCompilerLib(), "ktor-network-1.0.1.jar")
|
||||
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client.jar"),
|
||||
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar")
|
||||
)
|
||||
|
||||
val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }
|
||||
|
||||
Reference in New Issue
Block a user