From 909f32ed547085813622dc009184a9f716b0c52d Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Mon, 11 Sep 2023 15:52:36 +0200
Subject: [PATCH] Build: pass -Xexpect-actual-classes to some libraries compile
 tasks

To suppress the warning introduced in KT-61573.
---
 libraries/kotlin.test/annotations-common/build.gradle | 5 ++++-
 libraries/kotlin.test/js-ir/build.gradle.kts          | 3 ++-
 libraries/kotlin.test/js/build.gradle                 | 3 ++-
 libraries/stdlib/build.gradle.kts                     | 4 +++-
 libraries/stdlib/common/build.gradle                  | 3 ++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle
index c4b2246fd45..26521cc1445 100644
--- a/libraries/kotlin.test/annotations-common/build.gradle
+++ b/libraries/kotlin.test/annotations-common/build.gradle
@@ -10,7 +10,10 @@ dependencies {
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
-    kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
+    kotlinOptions.freeCompilerArgs += [
+        "-Xallow-kotlin-package",
+        "-Xexpect-actual-classes",
+    ]
 }
 
 jar {
diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts
index f1c06908b93..7f81b09c2d8 100644
--- a/libraries/kotlin.test/js-ir/build.gradle.kts
+++ b/libraries/kotlin.test/js-ir/build.gradle.kts
@@ -47,7 +47,8 @@ tasks.withType<KotlinCompile<*>>().configureEach {
     kotlinOptions.freeCompilerArgs += listOf(
         "-Xallow-kotlin-package",
         "-opt-in=kotlin.ExperimentalMultiplatform",
-        "-opt-in=kotlin.contracts.ExperimentalContracts"
+        "-opt-in=kotlin.contracts.ExperimentalContracts",
+        "-Xexpect-actual-classes"
     )
 }
 
diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index 9d18f1a5632..835a1056274 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -23,7 +23,8 @@ compileKotlin2Js {
             "-Xallow-kotlin-package",
             "-opt-in=kotlin.contracts.ExperimentalContracts",
             "-opt-in=kotlin.RequiresOptIn",
-            "-Xforce-deprecated-legacy-compiler-usage"
+            "-Xforce-deprecated-legacy-compiler-usage",
+            "-Xexpect-actual-classes"
     ]
     kotlinOptions {
         moduleKind = "umd"
diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
index 11f5291de3e..cf8befd0daf 100644
--- a/libraries/stdlib/build.gradle.kts
+++ b/libraries/stdlib/build.gradle.kts
@@ -79,7 +79,8 @@ kotlin {
                     kotlinOptions {
                         freeCompilerArgs = listOf(
                             "-Xallow-kotlin-package",
-                            "-module-name", "kotlin-stdlib-common"
+                            "-module-name", "kotlin-stdlib-common",
+                            "-Xexpect-actual-classes",
                         )
                     }
                     // workaround for compiling legacy MPP metadata, remove when this compilation is not needed anymore
@@ -201,6 +202,7 @@ kotlin {
                     freeCompilerArgs += listOf(
                         "-Xallow-kotlin-package",
                         "-Xforce-deprecated-legacy-compiler-usage",
+                        "-Xexpect-actual-classes",
                     )
                 }
                 compileTaskProvider.configure {
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index 53738f0a6df..51c61b6189c 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -50,6 +50,7 @@ compileKotlinCommon {
                 "-opt-in=kotlin.ExperimentalMultiplatform",
                 "-opt-in=kotlin.contracts.ExperimentalContracts",
                 "-Xallow-kotlin-package",
+                "-Xexpect-actual-classes",
         ]
     }
 }
@@ -116,4 +117,4 @@ publishing {
         }
         SbomKt.configureSbom(project, "Main", "kotlin-stdlib-common", ["compileClasspath"], mainPublication)
     }
-}
\ No newline at end of file
+}