From eeb0520b488689b21a6d4eecba9760b649e93aad Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 28 Jul 2022 11:50:28 +0200
Subject: [PATCH] [Gradle, JS] Migrate kotlin-stdlib-js

---
 .../integration/JsIrAnalysisHandlerExtensionTest.kt  |  7 +++++--
 libraries/stdlib/js-v1/build.gradle                  | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/js/js.tests/test/org/jetbrains/kotlin/integration/JsIrAnalysisHandlerExtensionTest.kt b/js/js.tests/test/org/jetbrains/kotlin/integration/JsIrAnalysisHandlerExtensionTest.kt
index d521422ba32..f0a0eadf97d 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/integration/JsIrAnalysisHandlerExtensionTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/integration/JsIrAnalysisHandlerExtensionTest.kt
@@ -65,11 +65,14 @@ class JsIrAnalysisHandlerExtensionTest : TestCaseWithTmpdir() {
             writeText(src.content)
         }
         val plugin = writePlugin()
+        val outputFile = File(outFile)
         val args = listOf(
             "-Xplugin=$plugin",
             "-libraries", libs,
-            "-output", outFile,
-            mainKt.absolutePath)
+            "-Xir-output-dir", outputFile.parentFile.path,
+            "-Xir-output-name", outputFile.nameWithoutExtension,
+            mainKt.absolutePath
+        )
         CompilerTestUtil.executeCompilerAssertSuccessful(compiler, args + extras)
     }
 
diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle
index 48667d361f7..de56e6b8fd5 100644
--- a/libraries/stdlib/js-v1/build.gradle
+++ b/libraries/stdlib/js-v1/build.gradle
@@ -173,20 +173,20 @@ task compileJs(type: NoDebugJavaExec) {
     def rootDir = rootDir
     def projectDir = projectDir
 
-    def compileBuiltinsKotlin2JsFiles = compileBuiltinsKotlin2Js.outputs.files
-    def compileKotlin2JsFiles = compileKotlin2Js.outputs.files
+    def compileBuiltinsKotlin2JsFiles = compileBuiltinsKotlin2Js.destinationDirectory
+    def compileKotlin2JsFiles = compileKotlin2Js.destinationDirectory
     doFirst {
         args = [jsOutputFileName, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() +
-                (compileBuiltinsKotlin2JsFiles.collect { it.path }.sort() +
-                        compileKotlin2JsFiles.collect { it.path }.sort()).findAll {
-                    it.endsWith(".js") && !it.endsWith(".meta.js")
+                (compileBuiltinsKotlin2JsFiles.asFile.get().listFiles().sort() +
+                        compileKotlin2JsFiles.asFile.get().listFiles().sort()).findAll {
+                    it.name.endsWith(".js") && !it.name.endsWith(".meta.js")
                 }
     }
     classpath = configurations.kotlinCompilerClasspath
 
     def sourceMapFile = file(jsOutputMapFileName)
     def jsOutputMetaFile = file(jsOutputMetaFileName)
-    def compileMetaFile = file(compileKotlin2Js.outputFile.path.replaceAll('\\.js$', '.meta.js'))
+    def compileMetaFile = file(compileKotlin2Js.outputFileProperty.map { it.path.replaceAll('\\.js$', '.meta.js') })
     def mainJsOutputDir = compileKotlin2Js.destinationDirectory
     doLast {
         ant.replaceregexp(