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

K2JS: get rid of MetaInfServices

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-10-28 17:04:05 +03:00
parent 73db22ae20
commit 44e7af7f65
4 changed files with 1 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+1 -11
View File
@@ -97,10 +97,6 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
Project project = environmentForJS.getProject();
List<JetFile> sourcesFiles = environmentForJS.getSourceFiles();
ClassPathLibrarySourcesLoader sourceLoader = new ClassPathLibrarySourcesLoader(project);
List<JetFile> additionalSourceFiles = sourceLoader.findSourceFiles();
sourcesFiles.addAll(additionalSourceFiles);
if (arguments.verbose) {
reportCompiledSourcesList(messageCollector, sourcesFiles);
}
@@ -222,13 +218,7 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
ContainerUtil.addAllNotNull(libraryFiles, arguments.libraryFiles);
}
if (!libraryFiles.isEmpty()) {
return new LibrarySourcesConfig(project, moduleId, libraryFiles, ecmaVersion, arguments.sourceMap, inlineEnabled);
}
else {
// lets discover the JS library definitions on the classpath
return new ClassPathLibraryDefintionsConfig(project, moduleId, ecmaVersion, arguments.sourceMap, inlineEnabled);
}
return new LibrarySourcesConfig(project, moduleId, libraryFiles, ecmaVersion, arguments.sourceMap, inlineEnabled);
}
public static MainCallParameters createMainCallParameters(String main) {