Sort .js files before passing them to merger to ensure stable output

#KT-23705 Fixed
2018-04-14 06:57:14 +03:00
parent c4da0e572d
commit 4f80f6d715
1 changed files with 4 additions and 4 deletions
@@ -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")
               }
    }