diff --git a/prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts b/prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts index d98de93217f..6e4ec561e3e 100644 --- a/prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts +++ b/prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts @@ -9,22 +9,23 @@ val compilerModules = listOf( ":compiler:cli", // for MessageRenderer, related to MessageCollector usage ":compiler:cli-base", // for kotlinx-benchmark ":compiler:cli-common", // for compiler arguments setup, for logging via MessageCollector, CompilerSystemProperties, ExitCode - ":compiler:config.jvm", // for K2JVMCompilerArguments initialization + ":compiler:compiler.version", // for user projects buildscripts ":compiler:config", // for kotlinx-benchmark + ":compiler:config.jvm", // for K2JVMCompilerArguments initialization ":compiler:frontend", // for kotlinx-benchmark + ":compiler:ir.serialization.common", // for kotlinx-benchmark ":compiler:ir.tree", // for PartialLinkageMode (K/N) ":compiler:util", // for CommonCompilerArguments initialization, K/N - ":compiler:compiler.version", // for user projects buildscripts ":core:compiler.common", // for kotlinx-benchmark ":core:compiler.common.jvm", // for FUS statistics parsing all the compiler arguments, otherwise it fails silently ":core:compiler.common.native", // for kotlinx-benchmark ":core:descriptors", // for kotlinx-benchmark - ":core:deserialization.common", // for kotlinx-benchmark ":core:deserialization", // for kotlinx-benchmark + ":core:deserialization.common", // for kotlinx-benchmark ":core:metadata", // for kotlinx-benchmark ":core:util.runtime", // for stdlib extensions - ":kotlin-build-common", // for incremental compilation setup ":js:js.config", // for k/js task + ":kotlin-build-common", // for incremental compilation setup ) dependencies { diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts index 67206f129ef..a161e653bd7 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts @@ -1,4 +1,3 @@ -import org.gradle.internal.deprecation.DeprecatableConfiguration import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.plugin.KotlinBasePluginWrapper @@ -168,6 +167,7 @@ fun Project.configureKotlinCompilationOptions() { ":compiler:config", ":compiler:config.jvm", ":compiler:frontend", + ":compiler:ir.serialization.common", ":compiler:ir.tree", ":compiler:util", ":core:compiler.common",