From 59997fb76acb43930cefc889152d744b82b8047f Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Fri, 18 Aug 2023 19:37:42 +0200 Subject: [PATCH] [Build] Update the list of modules with disabled K2 bootstrap #KT-61449 In Progress Relates to KT-59171 --- .../kotlin/common-configuration.gradle.kts | 56 ++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) 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 7082f8db553..67206f129ef 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 @@ -156,8 +156,62 @@ fun Project.configureKotlinCompilationOptions() { ) val coreLibProjects: List by rootProject.extra - val projectsWithDisabledFirBootstrap = coreLibProjects + listOf( + // Check prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts to find out why there're some specific compiler modules + val kgpAndDependencies = listOf( + ":atomicfu", + ":compiler:build-tools:kotlin-build-statistics", + ":compiler:build-tools:kotlin-build-tools-api", + ":compiler:cli", + ":compiler:cli-base", + ":compiler:cli-common", + ":compiler:compiler.version", + ":compiler:config", + ":compiler:config.jvm", + ":compiler:frontend", + ":compiler:ir.tree", + ":compiler:util", + ":core:compiler.common", + ":core:compiler.common.jvm", + ":core:compiler.common.native", + ":core:descriptors", + ":core:deserialization", + ":core:deserialization.common", + ":core:metadata", + ":core:util.runtime", + ":daemon-common", + ":gradle:android-test-fixes", + ":gradle:gradle-warnings-detector", + ":gradle:kotlin-compiler-args-properties", + ":js:js.config", + ":kotlin-allopen", + ":kotlin-assignment", + ":kotlin-build-common", + ":kotlin-build-tools-enum-compat", + ":kotlin-compiler-runner-unshaded", + ":kotlin-daemon-client", + ":kotlin-gradle-build-metrics", + ":kotlin-gradle-compiler-types", ":kotlin-gradle-plugin", + ":kotlin-gradle-plugin-annotations", + ":kotlin-gradle-plugin-api", + ":kotlin-gradle-plugin-idea", + ":kotlin-gradle-plugin-idea-proto", + ":kotlin-gradle-plugin-model", + ":kotlin-gradle-statistics", + ":kotlin-gradle-subplugin-example", + ":kotlin-lombok", + ":kotlin-noarg", + ":kotlin-project-model", + ":kotlin-sam-with-receiver", + ":kotlin-serialization", + ":kotlin-tooling-core", + ":kotlin-tooling-metadata", + ":kotlin-util-io", + ":kotlin-util-klib", + ":native:kotlin-klib-commonizer-api", + ":native:kotlin-native-utils", + ) + val projectsWithDisabledFirBootstrap = coreLibProjects + kgpAndDependencies + listOf( ":kotlinx-metadata", ":kotlinx-metadata-jvm", // For some reason stdlib isn't imported correctly for this module