From 9e3afe7a1f29b65cd68de49b6c650e81e4d09cee Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 3 Aug 2023 12:53:42 +0300
Subject: [PATCH] [Build] Add utility function to opt-in to
 ObsoleteDescriptorBasedAPI

---
 compiler/fir/fir2ir/build.gradle.kts                   |  9 +--------
 compiler/ir/ir.psi2ir/build.gradle.kts                 | 10 +---------
 compiler/ir/serialization.common/build.gradle.kts      |  9 +--------
 .../buildsrc-compat/src/main/kotlin/tasks.kt           |  4 ++++
 4 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts
index 288c80c40f9..59ca76eb079 100644
--- a/compiler/fir/fir2ir/build.gradle.kts
+++ b/compiler/fir/fir2ir/build.gradle.kts
@@ -49,6 +49,7 @@ dependencies {
 }
 
 optInToIrSymbolInternals()
+optInToObsoleteDescriptorBasedAPI()
 
 val generationRoot = projectDir.resolve("tests-gen")
 
@@ -60,14 +61,6 @@ sourceSets {
     }
 }
 
-tasks {
-    named<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileKotlin") {
-        kotlinOptions {
-            freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
-        }
-    }
-}
-
 if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     apply(plugin = "idea")
     idea {
diff --git a/compiler/ir/ir.psi2ir/build.gradle.kts b/compiler/ir/ir.psi2ir/build.gradle.kts
index 8a2dffa1ca1..2194fc417fa 100644
--- a/compiler/ir/ir.psi2ir/build.gradle.kts
+++ b/compiler/ir/ir.psi2ir/build.gradle.kts
@@ -12,17 +12,9 @@ dependencies {
 }
 
 optInToIrSymbolInternals()
+optInToObsoleteDescriptorBasedAPI()
 
 sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-
-tasks {
-    named<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileKotlin") {
-        kotlinOptions {
-            freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
-        }
-    }
-}
-
diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts
index 29682b9055f..ed31b4d28c0 100644
--- a/compiler/ir/serialization.common/build.gradle.kts
+++ b/compiler/ir/serialization.common/build.gradle.kts
@@ -17,16 +17,9 @@ dependencies {
 }
 
 optInToIrSymbolInternals()
+optInToObsoleteDescriptorBasedAPI()
 
 sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-
-tasks {
-    named<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileKotlin") {
-        kotlinOptions {
-            freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI"
-        }
-    }
-}
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt
index 32b83337725..1515d566e07 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt
@@ -417,3 +417,7 @@ fun Project.optInToExperimentalCompilerApi() {
 fun Project.optInToIrSymbolInternals() {
     optInTo("org.jetbrains.kotlin.ir.symbols.IrSymbolInternals")
 }
+
+fun Project.optInToObsoleteDescriptorBasedAPI() {
+    optInTo("org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI")
+}