diff --git a/build.gradle.kts b/build.gradle.kts index 042bb8d6013..29fc5e6c381 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -268,6 +268,7 @@ extra["kotlinJpsPluginMavenDependencies"] = listOf( ":kotlin-util-klib", ":kotlin-util-klib-metadata", ":native:kotlin-native-utils", + ":compiler:build-tools:kotlin-build-tools-api", ) extra["kotlinJpsPluginMavenDependenciesNonTransitiveLibs"] = listOf( diff --git a/compiler/build-tools/kotlin-build-statistics/build.gradle.kts b/compiler/build-tools/kotlin-build-statistics/build.gradle.kts index 7ee4f0968ba..3e847162f20 100644 --- a/compiler/build-tools/kotlin-build-statistics/build.gradle.kts +++ b/compiler/build-tools/kotlin-build-statistics/build.gradle.kts @@ -16,6 +16,7 @@ dependencies { compileOnly(kotlinStdlib()) compileOnly(intellijCore()) + implementation(project(":compiler:build-tools:kotlin-build-tools-api")) implementation(commonDependency("com.google.code.gson:gson")) testApi(kotlinStdlib()) } diff --git a/compiler/build-tools/kotlin-build-tools-api/api/kotlin-build-tools-api.api b/compiler/build-tools/kotlin-build-tools-api/api/kotlin-build-tools-api.api index 57bc109683e..ca7a66f553f 100644 --- a/compiler/build-tools/kotlin-build-tools-api/api/kotlin-build-tools-api.api +++ b/compiler/build-tools/kotlin-build-tools-api/api/kotlin-build-tools-api.api @@ -8,6 +8,16 @@ public final class org/jetbrains/kotlin/buildtools/api/CompilationService$Compan public final fun loadImplementation (Ljava/lang/ClassLoader;)Lorg/jetbrains/kotlin/buildtools/api/CompilationService; } +public abstract interface class org/jetbrains/kotlin/buildtools/api/KotlinLogger { + public abstract fun debug (Ljava/lang/String;)V + public abstract fun error (Ljava/lang/String;Ljava/lang/Throwable;)V + public static synthetic fun error$default (Lorg/jetbrains/kotlin/buildtools/api/KotlinLogger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V + public abstract fun info (Ljava/lang/String;)V + public abstract fun isDebugEnabled ()Z + public abstract fun lifecycle (Ljava/lang/String;)V + public abstract fun warn (Ljava/lang/String;)V +} + public final class org/jetbrains/kotlin/buildtools/api/SharedApiClassesClassLoader { public static final fun newInstance ()Ljava/lang/ClassLoader; } diff --git a/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt b/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt new file mode 100644 index 00000000000..d35693037ab --- /dev/null +++ b/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.buildtools.api + +public interface KotlinLogger { + public val isDebugEnabled: Boolean + public fun error(msg: String, throwable: Throwable? = null) + public fun warn(msg: String) + public fun info(msg: String) + public fun debug(msg: String) + public fun lifecycle(msg: String) +} \ No newline at end of file diff --git a/compiler/compiler-runner-unshaded/build.gradle.kts b/compiler/compiler-runner-unshaded/build.gradle.kts index dc525eedc51..ad71762d3ac 100644 --- a/compiler/compiler-runner-unshaded/build.gradle.kts +++ b/compiler/compiler-runner-unshaded/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { compileOnly(project(":kotlin-preloader")) compileOnly(project(":compiler:frontend.java")) compileOnly(project(":daemon-common")) + compileOnly(project(":compiler:build-tools:kotlin-build-tools-api")) compileOnly(project(":compiler:util")) compileOnly(intellijCore()) } diff --git a/compiler/util/src/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt b/compiler/util/src/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt deleted file mode 100644 index 239016544ac..00000000000 --- a/compiler/util/src/org/jetbrains/kotlin/buildtools/api/KotlinLogger.kt +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * 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.buildtools.api - -interface KotlinLogger { - val isDebugEnabled: Boolean - fun error(msg: String, throwable: Throwable? = null) - fun warn(msg: String) - fun info(msg: String) - fun debug(msg: String) - fun lifecycle(msg: String) -} \ No newline at end of file