diff --git a/compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/statistics/HttpReportService.kt b/compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/statistics/HttpReportService.kt index c8699e1a8e1..de2efa85d57 100644 --- a/compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/statistics/HttpReportService.kt +++ b/compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/statistics/HttpReportService.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.build.report.statistics import com.google.gson.Gson -import org.jetbrains.kotlin.compilerRunner.KotlinLogger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import java.io.IOException import java.io.Serializable import java.net.HttpURLConnection diff --git a/compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/statistics/file/FileReportService.kt b/compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/statistics/file/FileReportService.kt index df1e0e7fa02..7bd6911d4ae 100644 --- a/compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/statistics/file/FileReportService.kt +++ b/compiler/build-tools/kotlin-build-statistics/src/org/jetbrains/kotlin/build/report/statistics/file/FileReportService.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.build.report.metrics.* import org.jetbrains.kotlin.build.report.statistics.* import org.jetbrains.kotlin.build.report.statistics.asString import org.jetbrains.kotlin.build.report.statistics.formatTime -import org.jetbrains.kotlin.compilerRunner.KotlinLogger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import java.io.File import java.io.Serializable import java.text.SimpleDateFormat diff --git a/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt b/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt index 07a10d005a6..a8c1c510f9e 100644 --- a/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt +++ b/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.compilerRunner +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector diff --git a/compiler/util/src/org/jetbrains/kotlin/compilerRunner/KotlinLogger.kt b/compiler/util/src/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt similarity index 90% rename from compiler/util/src/org/jetbrains/kotlin/compilerRunner/KotlinLogger.kt rename to compiler/util/src/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt index ae7950c3546..239016544ac 100644 --- a/compiler/util/src/org/jetbrains/kotlin/compilerRunner/KotlinLogger.kt +++ b/compiler/util/src/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt @@ -3,7 +3,7 @@ * 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.compilerRunner +package org.jetbrains.kotlin.buildtools.api interface KotlinLogger { val isDebugEnabled: Boolean diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index e863da77a3e..16bd742c054 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.compilerRunner import com.intellij.util.xmlb.XmlSerializerUtil import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.api.GlobalOptions +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.jetbrains.kotlin.cli.common.CompilerSystemProperties import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.arguments.* diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt index 0d36a8d0ee1..a089ce0e86d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.compilerRunner import com.intellij.openapi.diagnostic.Logger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger internal class JpsKotlinLogger(private val log: Logger) : KotlinLogger { override fun error(msg: String, throwable: Throwable?) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt index 1dc7cac2b9a..44f58e52bd1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt @@ -3,6 +3,7 @@ package org.jetbrains.kotlin.compilerRunner import org.jetbrains.kotlin.build.report.metrics.BuildMetrics import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporterImpl import org.jetbrains.kotlin.build.report.metrics.BuildPerformanceMetric +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.utils.pathsAsStringRelativeTo diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt index 4c4cc33d4a1..cd5a314fd1e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.compilerRunner +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.jetbrains.kotlin.daemon.client.reportFromDaemon import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.daemon.common.ReportSeverity.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt index d559574163b..f4124fd18ee 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlin.gradle.logging.* import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskExecutionResults import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskLoggers import org.jetbrains.kotlin.build.report.statistics.StatTag +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.jetbrains.kotlin.gradle.report.* import org.jetbrains.kotlin.gradle.tasks.* import org.jetbrains.kotlin.gradle.tasks.OOMErrorException diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt index 7a264c2564e..8d3509bb762 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/reportUtils.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.compilerRunner import org.gradle.internal.impldep.org.apache.commons.lang.StringEscapeUtils +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/GradleKotlinLogger.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/GradleKotlinLogger.kt index c0e2813df54..46e2cb2f902 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/GradleKotlinLogger.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/GradleKotlinLogger.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.gradle.logging import org.gradle.api.logging.Logger -import org.jetbrains.kotlin.compilerRunner.KotlinLogger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger internal class GradleKotlinLogger(private val log: Logger) : KotlinLogger { override fun debug(msg: String) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/GradlePrintingMessageCollector.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/GradlePrintingMessageCollector.kt index 310dfa1a981..1fbe4466e61 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/GradlePrintingMessageCollector.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/GradlePrintingMessageCollector.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation import org.jetbrains.kotlin.cli.common.messages.GradleStyleMessageRenderer import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.compilerRunner.KotlinLogger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger internal class GradlePrintingMessageCollector( val logger: KotlinLogger, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/SL4JKotlinLogger.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/SL4JKotlinLogger.kt index fe4a80f1883..d168d489e30 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/SL4JKotlinLogger.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/SL4JKotlinLogger.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.logging -import org.jetbrains.kotlin.compilerRunner.KotlinLogger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.slf4j.Logger internal class SL4JKotlinLogger(private val log: Logger) : KotlinLogger { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt index 46ea81c104b..6d5599b6f43 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.gradle.logging import org.gradle.api.logging.Logger -import org.jetbrains.kotlin.compilerRunner.KotlinLogger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger internal fun Logger.kotlinInfo(message: String) { this.info("[KOTLIN] $message") diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/GradleLoggerAdapter.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/GradleLoggerAdapter.kt index 6d418b072b1..af14ccf6f9e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/GradleLoggerAdapter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/report/GradleLoggerAdapter.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.gradle.report import org.gradle.api.logging.Logger -import org.jetbrains.kotlin.compilerRunner.KotlinLogger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger class GradleLoggerAdapter(private val log: Logger) : KotlinLogger { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt index dd5885a50c7..38f0d4b09b2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter import org.jetbrains.kotlin.build.report.metrics.BuildTime import org.jetbrains.kotlin.build.report.metrics.measure import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.compilerRunner.KotlinLogger +import org.jetbrains.kotlin.buildtools.api.KotlinLogger import org.jetbrains.kotlin.gradle.internal.tasks.TaskWithLocalState import org.jetbrains.kotlin.gradle.internal.tasks.allOutputFiles import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger