From ae22dc352c33183e7ca61efe6dc683d0ce5e27e9 Mon Sep 17 00:00:00 2001
From: David Schreiber-Ranner <davidschreiber@users.noreply.github.com>
Date: Fri, 24 Jan 2020 14:12:02 +0100
Subject: [PATCH] Fix file components order

The path of the webpacked JavaScript file that should be included in the server JAR is constructed by taking the webpack tasks output directory, and appending the filename of the JavaScript module. Previously, the constructor arguments were flipped, leading to an invalid path.
---
 .../KotlinGradleWebMultiplatformModuleBuilder.kt              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
index a0aa0c4be24..b6d3f5b1bdb 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleWebMultiplatformModuleBuilder.kt
@@ -264,7 +264,7 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf
 
             jvmJar {
                 dependsOn(jsBrowserProductionWebpack)
-                from(new File(jsBrowserProductionWebpack.entry.name, jsBrowserProductionWebpack.outputPath))
+                from(new File(jsBrowserProductionWebpack.destinationDirectory, jsBrowserProductionWebpack.entry.name))
             }
             
             task run(type: JavaExec, dependsOn: [jvmJar]) {
@@ -275,4 +275,4 @@ class KotlinGradleWebMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatf
             }
         """.trimIndent()
     }
-}
\ No newline at end of file
+}