From df69e25d56c4f8a3a7c522c76f230d90c30a998a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Sun, 16 Dec 2018 03:17:34 +0300 Subject: [PATCH] Refactor: move logging code to org.jetbrains.kotlin.gradle.logging --- .../GradleCompilationResults.kt | 2 +- .../GradleCompilerEnvironment.kt | 4 +- .../GradleCompilerRunnerWithWorkers.kt | 2 +- ...leIncrementalCompilerServicesFacadeImpl.kt | 2 +- .../GradleKotlinCompilerRunner.kt | 4 +- .../GradleKotlinCompilerWork.kt | 40 +----------- .../compilerRunner/GradleKotlinLogger.kt | 40 ------------ .../kotlin/compilerRunner/reportUtils.kt | 6 +- .../internal/kapt/KaptGenerateStubsTask.kt | 2 +- .../internal/kapt/KaptWithKotlincTask.kt | 6 +- .../internal/kapt/KaptWithKotlincTask.kt.as31 | 4 +- .../gradle/logging/GradleKotlinLogger.kt | 30 +++++++++ .../logging/GradlePrintingMessageCollector.kt | 61 +++++++++++++++++++ .../logging}/SL4JKotlinLogger.kt | 3 +- .../gradle/{plugin => logging}/TaskLoggers.kt | 4 +- .../gradle/logging/gradleLoggingUtils.kt | 34 +++++++++++ .../gradle/{plugin => logging}/slf4jUtils.kt | 2 +- .../plugin/CopyClassesToJavaOutputStatus.kt | 1 + .../plugin/KotlinGradleBuildServices.kt | 2 + .../plugin/KotlinMultiplatformPlugin.kt | 1 + .../kotlin/gradle/plugin/KotlinPlugin.kt | 2 + .../gradle/plugin/KotlinPluginWrapper.kt | 1 + .../LegacyAndroidAndroidProjectHandler.kt | 1 + .../gradle/plugin/SubpluginEnvironment.kt | 1 + .../kotlin/gradle/plugin/gradleUtils.kt | 27 +------- .../internal/ScriptingGradleSubplugin.kt | 4 +- .../gradle/tasks/KotlinCompileCommon.kt | 3 +- .../kotlin/gradle/tasks/KotlinJsDce.kt | 5 +- .../kotlin/gradle/tasks/SourceRoots.kt | 2 +- .../kotlin/gradle/tasks/SyncOutputTask.kt | 2 +- .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 58 ++---------------- .../kotlin/gradle/tasks/tasksUtils.kt | 4 +- 32 files changed, 174 insertions(+), 186 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinLogger.kt create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/GradleKotlinLogger.kt create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/GradlePrintingMessageCollector.kt rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{compilerRunner => gradle/logging}/SL4JKotlinLogger.kt (85%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/{plugin => logging}/TaskLoggers.kt (90%) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/{plugin => logging}/slf4jUtils.kt (93%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt index 05a4586a64b..996953cd009 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.daemon.common.CompilationResults import org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT import org.jetbrains.kotlin.daemon.common.CompileIterationResult -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.utils.pathsAsStringRelativeTo import java.io.File import java.io.Serializable diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt index b3b47d49614..32164e385f8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt @@ -6,13 +6,13 @@ package org.jetbrains.kotlin.compilerRunner import org.jetbrains.kotlin.config.Services -import org.jetbrains.kotlin.gradle.tasks.GradleMessageCollector +import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector import org.jetbrains.kotlin.gradle.tasks.findToolsJar import java.io.File internal class GradleCompilerEnvironment( val compilerClasspath: List, - messageCollector: GradleMessageCollector, + messageCollector: GradlePrintingMessageCollector, outputItemsCollector: OutputItemsCollector, val localStateDirectories: List, val incrementalCompilationEnvironment: IncrementalCompilationEnvironment? = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerRunnerWithWorkers.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerRunnerWithWorkers.kt index d176006044a..fbff69f87ba 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerRunnerWithWorkers.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerRunnerWithWorkers.kt @@ -9,7 +9,7 @@ import org.gradle.api.Task import org.gradle.workers.ForkMode import org.gradle.workers.IsolationMode import org.gradle.workers.WorkerExecutor -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.kotlinDebug internal class GradleCompilerRunnerWithWorkers( task: Task, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt index 175e539f848..1306045de14 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.compilerRunner import org.jetbrains.kotlin.daemon.client.reportFromDaemon import org.jetbrains.kotlin.daemon.common.* -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug import org.jetbrains.kotlin.gradle.logging.GradleBufferingMessageCollector +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import java.io.Serializable import java.rmi.Remote import java.rmi.server.UnicastRemoteObject diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index 79e9a3dd755..94590f17f4c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.daemon.client.CompileServiceSession import org.jetbrains.kotlin.daemon.common.* -import org.jetbrains.kotlin.gradle.plugin.TaskLoggers -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.TaskLoggers +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.tasks.* import org.jetbrains.kotlin.gradle.utils.newTmpFile import org.jetbrains.kotlin.gradle.utils.relativeToRoot diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt index 4665bfb1ac3..982005ba0ca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt @@ -7,16 +7,10 @@ package org.jetbrains.kotlin.compilerRunner import org.gradle.api.Project import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.cli.common.messages.MessageRenderer import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.daemon.common.* -import org.jetbrains.kotlin.gradle.plugin.TaskLoggers -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug -import org.jetbrains.kotlin.gradle.logging.GradleBufferingMessageCollector -import org.jetbrains.kotlin.gradle.tasks.GradleMessageCollector +import org.jetbrains.kotlin.gradle.logging.* import org.jetbrains.kotlin.gradle.tasks.clearLocalStateDirectories import org.jetbrains.kotlin.gradle.tasks.throwGradleExceptionIfError import org.jetbrains.kotlin.gradle.utils.stackTraceAsString @@ -101,7 +95,7 @@ internal class GradleKotlinCompilerWork @Inject constructor( clearLocalStateDirectories(log, localStateDirectories, "IC is disabled") } - val messageCollector = GradleMessageCollector(log) + val messageCollector = GradlePrintingMessageCollector(log) val exitCode = try { compileWithDaemonOrFallbackImpl(messageCollector) } catch (e: Throwable) { @@ -263,7 +257,7 @@ internal class GradleKotlinCompilerWork @Inject constructor( } private fun compileOutOfProcess(): ExitCode = - runToolInSeparateProcess(compilerArgs, compilerClassName, compilerFullClasspath, log, loggingMessageCollector) + runToolInSeparateProcess(compilerArgs, compilerClassName, compilerFullClasspath, log) private fun compileInProcess(messageCollector: MessageCollector): ExitCode { // in-process compiler should always be run in a different thread @@ -322,32 +316,4 @@ internal class GradleKotlinCompilerWork @Inject constructor( } else { ReportSeverity.DEBUG.code } - - // used only for process launching so far, but implements unused proper contract - private val loggingMessageCollector: MessageCollector by lazy { - object : MessageCollector { - private var hasErrors = false - private val messageRenderer = MessageRenderer.PLAIN_FULL_PATHS - - override fun clear() { - hasErrors = false - } - - override fun hasErrors(): Boolean = hasErrors - - override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) { - val locMessage = messageRenderer.render(severity, message, location) - when (severity) { - CompilerMessageSeverity.EXCEPTION -> log.error(locMessage) - CompilerMessageSeverity.ERROR, - CompilerMessageSeverity.STRONG_WARNING, - CompilerMessageSeverity.WARNING, - CompilerMessageSeverity.INFO -> log.info(locMessage) - CompilerMessageSeverity.LOGGING -> log.debug(locMessage) - CompilerMessageSeverity.OUTPUT -> { - } - } - } - } - } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinLogger.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinLogger.kt deleted file mode 100644 index 3810881d21f..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinLogger.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.compilerRunner - -import org.gradle.api.logging.Logger - -internal class GradleKotlinLogger(private val log: Logger) : KotlinLogger { - override fun debug(msg: String) { - log.debug(msg) - } - - override fun error(msg: String) { - log.error(msg) - } - - override fun info(msg: String) { - log.info(msg) - } - - override fun warn(msg: String) { - log.warn(msg) - } - - override val isDebugEnabled: Boolean - get() = log.isDebugEnabled -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt index 585f9dee388..f25b39b72df 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt @@ -71,12 +71,12 @@ internal fun runToolInSeparateProcess( argsArray: Array, compilerClassName: String, classpath: List, - logger: KotlinLogger, - messageCollector: MessageCollector + logger: KotlinLogger ): ExitCode { val javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java" val classpathString = classpath.map { it.absolutePath }.joinToString(separator = File.pathSeparator) val builder = ProcessBuilder(javaBin, "-cp", classpathString, compilerClassName, *argsArray) + val messageCollector = createLoggingMessageCollector(logger) val process = launchProcessWithFallback(builder, DaemonReportingTargets(messageCollector = messageCollector)) // important to read inputStream, otherwise the process may hang on some systems @@ -95,7 +95,7 @@ internal fun runToolInSeparateProcess( return exitCodeFromProcessExitCode(logger, exitCode) } -internal fun createLoggingMessageCollector(log: KotlinLogger): MessageCollector = object : MessageCollector { +private fun createLoggingMessageCollector(log: KotlinLogger): MessageCollector = object : MessageCollector { private var hasErrors = false private val messageRenderer = MessageRenderer.PLAIN_FULL_PATHS diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt index 65cbc030b10..14fedb9266b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptGenerateStubsTask.kt @@ -22,7 +22,7 @@ import org.gradle.api.tasks.* import org.gradle.api.tasks.incremental.IncrementalTaskInputs import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.gradle.incremental.ChangedFiles -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.tasks.FilteringSourceRootsContainer import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.SourceRoots diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt index c416ff93365..6179b4b94ae 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt @@ -15,11 +15,11 @@ import org.gradle.api.tasks.TaskAction import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.compilerRunner.GradleCompilerEnvironment import org.jetbrains.kotlin.compilerRunner.GradleCompilerRunner -import org.jetbrains.kotlin.compilerRunner.GradleKotlinLogger +import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions -import org.jetbrains.kotlin.gradle.tasks.GradleMessageCollector +import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector import org.jetbrains.kotlin.gradle.tasks.localStateDirectories import org.jetbrains.kotlin.gradle.utils.toSortedPathsArray @@ -58,7 +58,7 @@ open class KaptWithKotlincTask : KaptTask(), CompilerArgumentAwareWithInput 0 && column > 0) { + append("($line, $column): ") + } + } + + append(message) + } + + when (severity) { + CompilerMessageSeverity.ERROR, + CompilerMessageSeverity.EXCEPTION -> { + hasErrors = true + logger.error(formatMsg("e")) + } + + CompilerMessageSeverity.WARNING, + CompilerMessageSeverity.STRONG_WARNING -> { + logger.warn(formatMsg("w")) + } + CompilerMessageSeverity.INFO -> { + logger.info(formatMsg("i")) + } + CompilerMessageSeverity.LOGGING, + CompilerMessageSeverity.OUTPUT -> { + logger.debug(formatMsg("v")) + } + }!! // !! is used to force compile-time exhaustiveness + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/SL4JKotlinLogger.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/SL4JKotlinLogger.kt similarity index 85% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/SL4JKotlinLogger.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/SL4JKotlinLogger.kt index 4ab3f68b501..e88b6e743f1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/SL4JKotlinLogger.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/SL4JKotlinLogger.kt @@ -3,8 +3,9 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.compilerRunner +package org.jetbrains.kotlin.gradle.logging +import org.jetbrains.kotlin.compilerRunner.KotlinLogger import org.slf4j.Logger internal class SL4JKotlinLogger(private val log: Logger) : KotlinLogger { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskLoggers.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/TaskLoggers.kt similarity index 90% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskLoggers.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/TaskLoggers.kt index 68f3320a777..57c2a56c5b6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskLoggers.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/TaskLoggers.kt @@ -3,14 +3,14 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.plugin +package org.jetbrains.kotlin.gradle.logging import org.gradle.api.logging.Logger import java.lang.ref.WeakReference import java.util.HashMap // todo: remove when https://github.com/gradle/gradle/issues/2678 is resolved -object TaskLoggers { +internal object TaskLoggers { private val taskLoggers = HashMap>() @Synchronized diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt new file mode 100644 index 00000000000..f1b57de6f0a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.logging + +import org.gradle.api.logging.Logger +import org.jetbrains.kotlin.compilerRunner.KotlinLogger + +internal fun Logger.kotlinInfo(message: String) { + this.info("[KOTLIN] $message") +} + +internal fun Logger.kotlinDebug(message: String) { + this.debug("[KOTLIN] $message") +} + +internal fun Logger.kotlinWarn(message: String) { + this.warn("[KOTLIN] $message") +} + +internal inline fun Logger.kotlinDebug(message: () -> String) { + if (isDebugEnabled) { + kotlinDebug(message()) + } +} + +internal inline fun KotlinLogger.kotlinDebug(fn: () -> String) { + if (isDebugEnabled) { + val msg = fn() + debug("[KOTLIN] $msg") + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/slf4jUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/slf4jUtils.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/slf4jUtils.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/slf4jUtils.kt index ccb4fc3ed5d..6bd58408270 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/slf4jUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/logging/slf4jUtils.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.plugin +package org.jetbrains.kotlin.gradle.logging import org.slf4j.Logger diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt index d1b288ac6ff..6f5b5f0aa27 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CopyClassesToJavaOutputStatus.kt @@ -5,6 +5,7 @@ import org.gradle.api.Task import org.gradle.api.specs.Spec import org.gradle.api.tasks.compile.JavaCompile import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension +import org.jetbrains.kotlin.gradle.logging.kotlinWarn import org.jetbrains.kotlin.gradle.utils.ParsedGradleVersion import java.util.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt index 0c7621485ab..9e9f0a430be 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt @@ -22,6 +22,8 @@ import org.gradle.api.invocation.Gradle import org.gradle.api.logging.Logging import org.jetbrains.kotlin.compilerRunner.DELETED_SESSION_FILE_PREFIX import org.jetbrains.kotlin.compilerRunner.GradleCompilerRunner +import org.jetbrains.kotlin.gradle.logging.TaskLoggers +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.utils.relativeToRoot import org.jetbrains.kotlin.utils.addToStdlib.sumByLong import java.lang.management.ManagementFactory diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt index 540c3f03aa9..a40d006115b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt @@ -24,6 +24,7 @@ import org.gradle.api.file.SourceDirectorySet import org.gradle.api.plugins.JavaPluginConvention import org.gradle.api.tasks.SourceSet import org.jetbrains.kotlin.gradle.dsl.kotlinExtension +import org.jetbrains.kotlin.gradle.logging.kotlinWarn import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile abstract class KotlinPlatformPluginBase(protected val platformName: String) : Plugin { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index b13017853f1..6c052b5c3b9 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -29,6 +29,8 @@ import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin.Companion.getKa import org.jetbrains.kotlin.gradle.internal.Kapt3KotlinGradleSubplugin import org.jetbrains.kotlin.gradle.internal.KaptVariantData import org.jetbrains.kotlin.gradle.internal.checkAndroidAnnotationProcessorDependencyUsage +import org.jetbrains.kotlin.gradle.logging.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.kotlinWarn import org.jetbrains.kotlin.gradle.model.builder.KotlinModelBuilder import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.scripting.internal.ScriptingGradleSubplugin diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt index bba4ad95ee9..82cbd36038a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt @@ -26,6 +26,7 @@ import org.gradle.api.logging.Logging import org.gradle.internal.reflect.Instantiator import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry import org.jetbrains.kotlin.gradle.dsl.* +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSetFactory diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt index bd95d0cf049..5f0718513c9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt @@ -19,6 +19,7 @@ import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.gradle.internal.KaptTask import org.jetbrains.kotlin.gradle.internal.KaptVariantData import org.jetbrains.kotlin.gradle.internal.registerGeneratedJavaSource +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.plugin.android.AndroidGradleWrapper import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation import org.jetbrains.kotlin.gradle.tasks.KotlinCompile diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt index e90a0958fff..a0f1ed0d4ed 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt @@ -3,6 +3,7 @@ package org.jetbrains.kotlin.gradle.plugin import org.gradle.api.Project import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions import java.util.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/gradleUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/gradleUtils.kt index 12864a7fbd3..d77de306906 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/gradleUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/gradleUtils.kt @@ -59,29 +59,4 @@ internal inline fun Any.addExtension(name: String, extension: (this as ExtensionAware).extensions.add(name, extension) internal fun Any.getConvention(name: String): Any? = - (this as HasConvention).convention.plugins[name] - -internal fun Logger.kotlinInfo(message: String) { - this.info("[KOTLIN] $message") -} - -internal fun Logger.kotlinDebug(message: String) { - this.debug("[KOTLIN] $message") -} - -internal fun Logger.kotlinWarn(message: String) { - this.warn("[KOTLIN] $message") -} - -internal inline fun Logger.kotlinDebug(message: () -> String) { - if (isDebugEnabled) { - kotlinDebug(message()) - } -} - -internal inline fun KotlinLogger.kotlinDebug(fn: () -> String) { - if (isDebugEnabled) { - val msg = fn() - debug("[KOTLIN] $msg") - } -} \ No newline at end of file + (this as HasConvention).convention.plugins[name] \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt index 2bbf48c323d..b26703962cc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt @@ -15,7 +15,7 @@ import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.scripting.ScriptingExtension -import org.jetbrains.kotlin.gradle.tasks.GradleMessageCollector +import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptDefinitionsFromClasspathDiscoverySource @@ -91,7 +91,7 @@ open class DiscoverScriptExtensionsTask : DefaultTask() { val definitions = ScriptDefinitionsFromClasspathDiscoverySource( scriptingClasspath.toList(), emptyMap(), - GradleMessageCollector(logger) + GradlePrintingMessageCollector(logger) ).definitions val extensions = definitions.mapTo(arrayListOf(), KotlinScriptDefinition::fileExtension) val kotlinSourceSet = sourceSet.getConvention(KOTLIN_DSL_NAME) as? KotlinSourceSet diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt index f243d86a326..92cf509883c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompile import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptions import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptionsImpl import org.jetbrains.kotlin.gradle.dsl.fillDefaultValues +import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector import org.jetbrains.kotlin.incremental.ChangedFiles import java.io.File @@ -64,7 +65,7 @@ open class KotlinCompileCommon : AbstractKotlinCompile(), KotlinJs val allArgs = argsArray + outputDirArgs + inputFiles val exitCode = runToolInSeparateProcess( allArgs, K2JSDce::class.java.name, computedCompilerClasspath, - log, createLoggingMessageCollector(log) + log ) throwGradleExceptionIfError(exitCode) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SourceRoots.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SourceRoots.kt index c3179e58e3e..b7fe8724d01 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SourceRoots.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SourceRoots.kt @@ -3,7 +3,7 @@ package org.jetbrains.kotlin.gradle.tasks import org.gradle.api.file.FileTree import org.gradle.api.file.SourceDirectorySet import org.gradle.api.logging.Logger -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.utils.isJavaFile import org.jetbrains.kotlin.gradle.utils.isKotlinFile import org.jetbrains.kotlin.gradle.utils.isParentOf diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SyncOutputTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SyncOutputTask.kt index a003f9321b7..8686410cb78 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SyncOutputTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SyncOutputTask.kt @@ -20,7 +20,7 @@ import org.gradle.api.DefaultTask import org.gradle.api.tasks.* import org.gradle.api.tasks.incremental.IncrementalTaskInputs import org.gradle.api.tasks.incremental.InputFileDetails -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.utils.isParentOf import java.io.File import java.io.ObjectInputStream diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 2ee4ed74a24..9ba12c76b81 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.tasks import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.file.FileCollection -import org.gradle.api.logging.Logger import org.gradle.api.plugins.BasePluginConvention import org.gradle.api.tasks.* import org.gradle.api.tasks.Optional @@ -21,15 +20,15 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.compilerRunner.* import org.jetbrains.kotlin.daemon.common.MultiModuleICSettings import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.incremental.ChangedFiles import org.jetbrains.kotlin.gradle.internal.CompilerArgumentAwareWithInput import org.jetbrains.kotlin.gradle.internal.prepareCompilerArguments +import org.jetbrains.kotlin.gradle.logging.GradlePrintingMessageCollector +import org.jetbrains.kotlin.gradle.logging.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.kotlinWarn import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.utils.ParsedGradleVersion import org.jetbrains.kotlin.gradle.utils.isParentOf @@ -387,7 +386,7 @@ open class KotlinCompile : AbstractKotlinCompile(), Kotl override fun callCompilerAsync(args: K2JVMCompilerArguments, sourceRoots: SourceRoots, changedFiles: ChangedFiles) { sourceRoots as SourceRoots.ForJvm - val messageCollector = GradleMessageCollector(logger) + val messageCollector = GradlePrintingMessageCollector(logger) val outputItemCollector = OutputItemsCollectorImpl() val compilerRunner = compilerRunner() @@ -546,7 +545,7 @@ open class Kotlin2JsCompile : AbstractKotlinCompile(), Ko logger.kotlinDebug("compiling with args ${ArgumentUtils.convertArgumentsToStringList(args)}") - val messageCollector = GradleMessageCollector(logger) + val messageCollector = GradlePrintingMessageCollector(logger) val outputItemCollector = OutputItemsCollectorImpl() val compilerRunner = compilerRunner() @@ -582,50 +581,3 @@ private fun Task.getGradleVersion(): ParsedGradleVersion? { return result } -internal class GradleMessageCollector(val logger: KotlinLogger) : MessageCollector { - constructor(logger: Logger) : this(GradleKotlinLogger(logger)) - - private var hasErrors = false - - override fun hasErrors() = hasErrors - - override fun clear() { - // Do nothing - } - - override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) { - fun formatMsg(prefix: String) = - buildString { - append("$prefix: ") - - location?.apply { - append("$path: ") - if (line > 0 && column > 0) { - append("($line, $column): ") - } - } - - append(message) - } - - when (severity) { - CompilerMessageSeverity.ERROR, - CompilerMessageSeverity.EXCEPTION -> { - hasErrors = true - logger.error(formatMsg("e")) - } - - CompilerMessageSeverity.WARNING, - CompilerMessageSeverity.STRONG_WARNING -> { - logger.warn(formatMsg("w")) - } - CompilerMessageSeverity.INFO -> { - logger.info(formatMsg("i")) - } - CompilerMessageSeverity.LOGGING, - CompilerMessageSeverity.OUTPUT -> { - logger.debug(formatMsg("v")) - } - }!! // !! is used to force compile-time exhaustiveness - } -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt index 1f2dd65a34d..b7a4ae3e148 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt @@ -3,9 +3,9 @@ package org.jetbrains.kotlin.gradle.tasks import org.gradle.api.GradleException import org.gradle.api.Task import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.compilerRunner.GradleKotlinLogger +import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger import org.jetbrains.kotlin.compilerRunner.KotlinLogger -import org.jetbrains.kotlin.gradle.plugin.kotlinDebug +import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.utils.outputsCompatible import java.io.File