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 8d922d106c9..8ba8b16b28f 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
@@ -129,7 +129,63 @@ fun Project.configureKotlinCompilationOptions() {
         val renderDiagnosticNames by extra(project.kotlinBuildProperties.renderDiagnosticNames)
 
         val coreLibProjects: List<String> by rootProject.extra
-        val projectsWithForced19LanguageVersion = coreLibProjects + listOf(
+        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.serialization.common",
+            ":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",
+            ":kotlin-util-klib-metadata",
+            ":native:kotlin-klib-commonizer-api",
+            ":native:kotlin-native-utils",
+        )
+        val projectsWithForced19LanguageVersion = coreLibProjects + kgpAndDependencies + listOf(
             ":kotlin-stdlib-jvm-minimal-for-test",
             ":kotlin-stdlib-js-ir-minimal-for-test",
             ":kotlin-stdlib-wasm-js",