From c62257bbab9a2440812ee5ef7fc25d35366d37c8 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 24 May 2022 11:07:20 +0300
Subject: [PATCH] [Build] Use `-Xuse-k2` flag instead of `-Xuse-fir`

---
 buildSrc/src/main/kotlin/common-configuration.gradle.kts | 2 +-
 libraries/commonConfiguration.gradle                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts
index c0da61bf7d4..5b60f73b87e 100644
--- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts
+++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts
@@ -163,7 +163,7 @@ fun Project.configureKotlinCompilationOptions() {
                 freeCompilerArgs += jvmCompilerArgs
 
                 if (useJvmFir && project.path !in projectsWithDisabledFirBootstrap) {
-                    freeCompilerArgs += "-Xuse-fir"
+                    freeCompilerArgs += "-Xuse-k2"
                     freeCompilerArgs += "-Xabi-stability=stable"
                     if (useFirLT) {
                         freeCompilerArgs += "-Xuse-fir-lt"
diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 2574aecbdff..d4350496c6e 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -60,7 +60,7 @@ ext.configureFrontendIr = { Project project ->
     project.tasks.withType(KotlinCompile.class) { task ->
         task.kotlinOptions {
             if (project.kotlinBuildProperties.useFirForLibraries) {
-                freeCompilerArgs += "-Xuse-fir"
+                freeCompilerArgs += "-Xuse-k2"
                 allWarningsAsErrors = false
             }
             if (project.properties.renderDiagnosticNames) {