From f7b139466da4c14ff52b823646f392e8aa6cccdf Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Thu, 30 Nov 2023 13:45:39 +0100 Subject: [PATCH] [Build] Move the daemon client sources into the default directory --- compiler/daemon/daemon-client/build.gradle.kts | 5 ----- .../kotlin}/BasicCompilerServicesWithResultsFacadeServer.kt | 0 .../kotlin}/CompilerCallbackServicesFacadeServer.kt | 0 .../daemon/client => main/kotlin}/KotlinCompilerClient.kt | 0 .../client => main/kotlin}/KotlinRemoteReplCompilerClient.kt | 0 .../daemon/client => main/kotlin}/LastDaemonCliOutputs.kt | 0 .../daemon/client => main/kotlin}/LimitedLinkedList.kt | 0 .../daemon/client => main/kotlin}/NativePlatformUtil.kt | 0 .../daemon/client => main/kotlin}/RemoteInputStreamServer.kt | 0 .../client => main/kotlin}/RemoteOutputStreamServer.kt | 0 .../daemon/client => main/kotlin}/RemoteReplCompilerState.kt | 0 11 files changed, 5 deletions(-) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/BasicCompilerServicesWithResultsFacadeServer.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/CompilerCallbackServicesFacadeServer.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/KotlinCompilerClient.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/KotlinRemoteReplCompilerClient.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/LastDaemonCliOutputs.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/LimitedLinkedList.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/NativePlatformUtil.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/RemoteInputStreamServer.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/RemoteOutputStreamServer.kt (100%) rename compiler/daemon/daemon-client/src/{org/jetbrains/kotlin/daemon/client => main/kotlin}/RemoteReplCompilerState.kt (100%) diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts index dad79aa026d..d3a5dae99ff 100644 --- a/compiler/daemon/daemon-client/build.gradle.kts +++ b/compiler/daemon/daemon-client/build.gradle.kts @@ -31,11 +31,6 @@ dependencies { configureKotlinCompileTasksGradleCompatibility() -sourceSets { - "main" { projectDefault() } - "test" {} -} - publish() runtimeJar() diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/BasicCompilerServicesWithResultsFacadeServer.kt b/compiler/daemon/daemon-client/src/main/kotlin/BasicCompilerServicesWithResultsFacadeServer.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/BasicCompilerServicesWithResultsFacadeServer.kt rename to compiler/daemon/daemon-client/src/main/kotlin/BasicCompilerServicesWithResultsFacadeServer.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt b/compiler/daemon/daemon-client/src/main/kotlin/CompilerCallbackServicesFacadeServer.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt rename to compiler/daemon/daemon-client/src/main/kotlin/CompilerCallbackServicesFacadeServer.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/main/kotlin/KotlinCompilerClient.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt rename to compiler/daemon/daemon-client/src/main/kotlin/KotlinCompilerClient.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinRemoteReplCompilerClient.kt b/compiler/daemon/daemon-client/src/main/kotlin/KotlinRemoteReplCompilerClient.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinRemoteReplCompilerClient.kt rename to compiler/daemon/daemon-client/src/main/kotlin/KotlinRemoteReplCompilerClient.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/LastDaemonCliOutputs.kt b/compiler/daemon/daemon-client/src/main/kotlin/LastDaemonCliOutputs.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/LastDaemonCliOutputs.kt rename to compiler/daemon/daemon-client/src/main/kotlin/LastDaemonCliOutputs.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/LimitedLinkedList.kt b/compiler/daemon/daemon-client/src/main/kotlin/LimitedLinkedList.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/LimitedLinkedList.kt rename to compiler/daemon/daemon-client/src/main/kotlin/LimitedLinkedList.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/NativePlatformUtil.kt b/compiler/daemon/daemon-client/src/main/kotlin/NativePlatformUtil.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/NativePlatformUtil.kt rename to compiler/daemon/daemon-client/src/main/kotlin/NativePlatformUtil.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteInputStreamServer.kt b/compiler/daemon/daemon-client/src/main/kotlin/RemoteInputStreamServer.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteInputStreamServer.kt rename to compiler/daemon/daemon-client/src/main/kotlin/RemoteInputStreamServer.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteOutputStreamServer.kt b/compiler/daemon/daemon-client/src/main/kotlin/RemoteOutputStreamServer.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteOutputStreamServer.kt rename to compiler/daemon/daemon-client/src/main/kotlin/RemoteOutputStreamServer.kt diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteReplCompilerState.kt b/compiler/daemon/daemon-client/src/main/kotlin/RemoteReplCompilerState.kt similarity index 100% rename from compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteReplCompilerState.kt rename to compiler/daemon/daemon-client/src/main/kotlin/RemoteReplCompilerState.kt