diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java index 13774d743af..e5e2e40b3ee 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java +++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java @@ -33,7 +33,6 @@ import org.jetbrains.jet.cli.common.messages.MessageCollectorUtil; import java.io.File; import java.io.PrintStream; import java.util.List; -import java.util.Set; public class KotlinCompilerRunner { private static final String K2JVM_COMPILER = "org.jetbrains.jet.cli.jvm.K2JVMCompiler"; @@ -62,7 +61,7 @@ public class KotlinCompilerRunner { CompilerEnvironment environment, OutputItemsCollector collector, List sourceFiles, - Set libraryFiles, + List libraryFiles, File outputFile ) { K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); @@ -147,7 +146,7 @@ public class KotlinCompilerRunner { private static void setupK2JsSettings( File outputFile, List sourceFiles, - Set libraryFiles, + List libraryFiles, K2JSCompilerArguments settings ) { setupCommonSettings(settings); diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java b/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java index e1ece25113a..9e521435843 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java +++ b/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java @@ -29,34 +29,36 @@ import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import org.jetbrains.jps.util.JpsPathUtil; -import java.util.HashSet; +import java.io.File; +import java.util.ArrayList; +import java.util.List; import java.util.Set; class JpsJsModuleUtils { private JpsJsModuleUtils() {} @NotNull - static Set getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { - Set result = new HashSet(); + static List getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { + List result = new ArrayList(); getLibraryFiles(target, result); getDependencyModulesAndSources(target, result); return result; } - static void getLibraryFiles(@NotNull ModuleBuildTarget target, @NotNull Set result) { + static void getLibraryFiles(@NotNull ModuleBuildTarget target, @NotNull List result) { Set libraries = JpsUtils.getAllDependencies(target).getLibraries(); for (JpsLibrary library : libraries) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { String path = JpsPathUtil.urlToOsPath(root.getUrl()); // TODO: Do we need to add to dependency all libraries? - if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(path))) { + if (LibraryUtils.isJsRuntimeLibrary(new File(path))) { result.add(path); } } } } - static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, @NotNull final Set result) { + static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, @NotNull final List result) { JpsUtils.getAllDependencies(target).processModules(new Consumer() { @Override public void consume(JpsModule module) { diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 70e32c89e5e..30886961a3d 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -138,7 +138,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { } File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); - Set libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); + List libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); K2JSCompilerArguments k2JsSettings = JpsKotlinCompilerSettings.getK2JsSettings(project); runK2JsCompiler(commonSettings, k2JsSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile);