[BT] Move KotlinLogger to the bt-api package

#KT-57398 In Progress
This commit is contained in:
Alexander.Likhachev
2023-05-02 20:48:16 +02:00
committed by Space Team
parent 6e07d432b3
commit 1005d0244a
16 changed files with 16 additions and 9 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.*
@@ -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?) {
@@ -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
@@ -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.*
@@ -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
@@ -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
@@ -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) {
@@ -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,
@@ -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 {
@@ -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")
@@ -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 {
@@ -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