From d72631a773313fc19911bb655df362b4beb6aff6 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 1 Aug 2023 21:47:22 +0200
Subject: [PATCH] [stdlib-mpp] Workarounds for opt-in problems caused by
 languageSettings DSL rework

KT-56106
---
 libraries/stdlib/build.gradle.kts | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
index ae4222eca4b..adcbf41956a 100644
--- a/libraries/stdlib/build.gradle.kts
+++ b/libraries/stdlib/build.gradle.kts
@@ -48,6 +48,16 @@ val jsIrMainSources = "${buildDir}/src/jsMainSources"
 lateinit var jsIrTarget: KotlinJsTargetDsl
 lateinit var jsV1Target: KotlinJsTargetDsl
 
+val commonOptIns = listOf(
+    "kotlin.ExperimentalMultiplatform",
+    "kotlin.contracts.ExperimentalContracts",
+)
+val commonTestOptIns = listOf(
+    "kotlin.ExperimentalUnsignedTypes",
+    "kotlin.ExperimentalStdlibApi",
+    "kotlin.io.encoding.ExperimentalEncodingApi",
+)
+
 kotlin {
     metadata {
         compilations {
@@ -59,6 +69,9 @@ kotlin {
                             "-module-name", "kotlin-stdlib-common"
                         )
                     }
+                    // workaround for compiling legacy MPP metadata, remove when this compilation is not needed anymore
+                    // restate the list of opt-ins
+                    compilerOptions.optIn.addAll(commonOptIns)
                 }
             }
         }
@@ -179,6 +192,9 @@ kotlin {
                     // proper caching
                     // source map paths are sensitive to relative source location
                     inputs.property("relativeSrcPath", file(jsV1Dir).relativeTo(projectDir).invariantSeparatorsPath)
+                    // workaround for compiling legacy JS target, remove when this compilation is not needed anymore
+                    // restate the list of opt-ins
+                    compilerOptions.optIn.addAll(commonOptIns)
                 }
             }
             val main by getting
@@ -432,13 +448,10 @@ kotlin {
                     return@languageSettings
                 }
                 if (this@sourceSet != jsV1Runtime) {
-                    optIn("kotlin.ExperimentalMultiplatform")
-                    optIn("kotlin.contracts.ExperimentalContracts")
+                    commonOptIns.forEach { optIn(it) }
                 }
                 if (this@sourceSet.name.endsWith("Test")) {
-                    optIn("kotlin.ExperimentalUnsignedTypes")
-                    optIn("kotlin.ExperimentalStdlibApi")
-                    optIn("kotlin.io.encoding.ExperimentalEncodingApi")
+                    commonTestOptIns.forEach { optIn(it) }
                 }
             }
         }