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

Remove new kotlin daemon from dist

Browse Source 
hopefully temporarily, also see #KTI-173
This commit is contained in:
Ilya Chernikov
2020-05-20 16:07:43 +02:00
parent 3dd79ffea6
commit 574b917061
6 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt
+1 -2
View File
@@ -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"),
compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt
+2 -3
View File
@@ -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) }