azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
#KT-23705 Fixed
This commit is contained in:
Ilya Gorbunov
2018-04-14 06:57:14 +03:00
parent c4da0e572d
commit 4f80f6d715
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/js/build.gradle
+4 -4
View File
@@ -174,10 +174,10 @@ task compileJs(type: JavaExec) {
main = "org.jetbrains.kotlin.js.FileMergerKt" main = "org.jetbrains.kotlin.js.FileMergerKt"
doFirst { doFirst {
args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path } + args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() +
(compileBuiltinsKotlin2Js.outputs.files.collect { it.path } + (compileBuiltinsKotlin2Js.outputs.files.collect { it.path }.sort() +
compileKotlin2Js.outputs.files.collect { it.path } + compileKotlin2Js.outputs.files.collect { it.path }.sort() +
compileExperimentalKotlin2Js.outputs.files.collect { it.path }).findAll { compileExperimentalKotlin2Js.outputs.files.collect { it.path }.sort()).findAll {
it.endsWith(".js") && !it.endsWith(".meta.js") it.endsWith(".js") && !it.endsWith(".meta.js")
} }
} }