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/build.gradle.kts
-6
View File
@@ -24,15 +24,9 @@ dependencies {
runtime(project(":kotlin-reflect")) runtime(project(":kotlin-reflect"))
embedded(project(":daemon-common")) { isTransitive = false } embedded(project(":daemon-common")) { isTransitive = false }
embedded(project(":daemon-common-new")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false isTransitive = false
} }
compile(commonDep("io.ktor", "ktor-network")) {
ktorExcludesForDaemon.forEach { (group, module) ->
exclude(group = group, module = module)
}
}
} }
sourceSets { sourceSets {
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( val compilerClassPath = listOf(
File(compilerLibDir, "kotlin-compiler.jar"), File(compilerLibDir, "kotlin-compiler.jar"),
File(compilerLibDir, "kotlin-daemon.jar"), File(compilerLibDir, "kotlin-daemon.jar")
File(compilerLibDir, "ktor-network-1.0.1.jar")
) )
val scriptRuntimeClassPath = listOf( val scriptRuntimeClassPath = listOf(
File(compilerLibDir, "kotlin-runtime.jar"), 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( val daemonClientClassPath = listOf(
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client-new.jar"), File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client.jar"),
File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"), File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar")
File(KotlinIntegrationTestBase.getCompilerLib(), "ktor-network-1.0.1.jar")
) )
val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) } val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }
compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt
+1 -2
View File
@@ -99,14 +99,13 @@ interface KotlinPaths {
ScriptingJvmLib(PathUtil.KOTLIN_SCRIPTING_JVM_NAME), ScriptingJvmLib(PathUtil.KOTLIN_SCRIPTING_JVM_NAME),
CoroutinesCore(PathUtil.KOTLINX_COROUTINES_CORE_NAME), CoroutinesCore(PathUtil.KOTLINX_COROUTINES_CORE_NAME),
KotlinDaemon(PathUtil.KOTLIN_DAEMON_NAME), KotlinDaemon(PathUtil.KOTLIN_DAEMON_NAME),
Ktor(PathUtil.KTOR_NAME),
MainKts(PathUtil.MAIN_KTS_NAME) MainKts(PathUtil.MAIN_KTS_NAME)
} }
// TODO: Maybe we need separate classpaths for compilers with and without the daemon // TODO: Maybe we need separate classpaths for compilers with and without the daemon
enum class ClassPaths(val contents: List<Jar> = emptyList()) { enum class ClassPaths(val contents: List<Jar> = emptyList()) {
Empty(), Empty(),
Compiler(Jar.Compiler, Jar.StdLib, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j, Jar.KotlinDaemon, Jar.Ktor), Compiler(Jar.Compiler, Jar.StdLib, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j, Jar.KotlinDaemon),
CompilerWithScripting(Compiler, Jar.ScriptingPlugin, Jar.ScriptingImpl, Jar.ScriptingLib, Jar.ScriptingJvmLib), CompilerWithScripting(Compiler, Jar.ScriptingPlugin, Jar.ScriptingImpl, Jar.ScriptingLib, Jar.ScriptingJvmLib),
MainKts(Jar.MainKts, Jar.ScriptRuntime, Jar.StdLib, Jar.Reflect) MainKts(Jar.MainKts, Jar.ScriptRuntime, Jar.StdLib, Jar.Reflect)
; ;
compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
-1
View File
@@ -69,7 +69,6 @@ object PathUtil {
const val KOTLIN_SCRIPTING_JS_NAME = "kotlin-scripting-js" const val KOTLIN_SCRIPTING_JS_NAME = "kotlin-scripting-js"
const val KOTLIN_SCRIPTING_JS_JAR = "$KOTLIN_SCRIPTING_JS_NAME.jar" const val KOTLIN_SCRIPTING_JS_JAR = "$KOTLIN_SCRIPTING_JS_NAME.jar"
const val KOTLIN_DAEMON_NAME = "kotlin-daemon" const val KOTLIN_DAEMON_NAME = "kotlin-daemon"
const val KTOR_NAME = "ktor-network-1.0.1"
const val KOTLIN_DAEMON_JAR = "$KOTLIN_SCRIPTING_JVM_NAME.jar" const val KOTLIN_DAEMON_JAR = "$KOTLIN_SCRIPTING_JVM_NAME.jar"
const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler" const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler"
const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "$KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME.jar" const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "$KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME.jar"
prepare/compiler/build.gradle.kts
+2 -2
View File
@@ -84,7 +84,8 @@ val distLibraryProjects = listOfNotNull(
":kotlin-coroutines-experimental-compat", ":kotlin-coroutines-experimental-compat",
":kotlin-daemon", ":kotlin-daemon",
":kotlin-daemon-client", ":kotlin-daemon-client",
":kotlin-daemon-client-new", // TODO: uncomment when new daemon will be put back into dist
// ":kotlin-daemon-client-new",
":kotlin-imports-dumper-compiler-plugin", ":kotlin-imports-dumper-compiler-plugin",
":kotlin-main-kts", ":kotlin-main-kts",
":kotlin-preloader", ":kotlin-preloader",
@@ -148,7 +149,6 @@ dependencies {
} }
libraries(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } } libraries(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
libraries(commonDep("io.ktor", "ktor-network"))
libraries(kotlinStdlib("jdk8")) libraries(kotlinStdlib("jdk8"))
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) { if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
libraries(kotlinStdlib("js", "distLibrary")) libraries(kotlinStdlib("js", "distLibrary"))