From 4f80f6d715f7f2bddd346b80fbff49f4b330c4e9 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 14 Apr 2018 06:57:14 +0300 Subject: [PATCH] Sort .js files before passing them to merger to ensure stable output #KT-23705 Fixed --- libraries/stdlib/js/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle index 2320f27168d..7e72733b25e 100644 --- a/libraries/stdlib/js/build.gradle +++ b/libraries/stdlib/js/build.gradle @@ -174,10 +174,10 @@ task compileJs(type: JavaExec) { main = "org.jetbrains.kotlin.js.FileMergerKt" doFirst { - args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path } + - (compileBuiltinsKotlin2Js.outputs.files.collect { it.path } + - compileKotlin2Js.outputs.files.collect { it.path } + - compileExperimentalKotlin2Js.outputs.files.collect { it.path }).findAll { + args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() + + (compileBuiltinsKotlin2Js.outputs.files.collect { it.path }.sort() + + compileKotlin2Js.outputs.files.collect { it.path }.sort() + + compileExperimentalKotlin2Js.outputs.files.collect { it.path }.sort()).findAll { it.endsWith(".js") && !it.endsWith(".meta.js") } }