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

Revert changes to ClassPathLibrary*

Browse Source 
Cosmetics also.
This commit is contained in:
Pavel V. Talanov
2012-07-30 15:47:40 +04:00
parent 6fe6f03e2c
commit dad946b58d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibraryDefintionsConfig.java
+2 -1
View File
@@ -26,8 +26,9 @@ import java.util.List;
* A Config implementation which is configured with a directory to find the standard library names from * A Config implementation which is configured with a directory to find the standard library names from
*/ */
public class ClassPathLibraryDefintionsConfig extends Config { public class ClassPathLibraryDefintionsConfig extends Config {
// used by maven build
@NotNull @NotNull
private static final String META_INF_SERVICES_FILE = "META-INF/services/org.jetbrains.kotlin.js.libraryDefinitions"; public static final String META_INF_SERVICES_FILE = "META-INF/services/org.jetbrains.kotlin.js.libraryDefinitions";
public ClassPathLibraryDefintionsConfig(@NotNull Project project, @NotNull String moduleId, @NotNull EcmaVersion version) { public ClassPathLibraryDefintionsConfig(@NotNull Project project, @NotNull String moduleId, @NotNull EcmaVersion version) {
super(project, moduleId, version); super(project, moduleId, version);
js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibrarySourcesLoader.java
+5 -2
View File
@@ -26,9 +26,12 @@ import java.util.List;
* A helper class to load the kotlin library sources to be compiled to JavaScript as part of a JavaScript build * A helper class to load the kotlin library sources to be compiled to JavaScript as part of a JavaScript build
*/ */
public class ClassPathLibrarySourcesLoader { public class ClassPathLibrarySourcesLoader {
// used by maven build
@NotNull @NotNull
private static final String META_INF_SERVICES_FILE = "META-INF/services/org.jetbrains.kotlin.js.librarySource"; public static final String META_INF_SERVICES_FILE = "META-INF/services/org.jetbrains.kotlin.js.librarySource";
@NotNull private final Project project; @NotNull
private final Project project;
public ClassPathLibrarySourcesLoader(@NotNull Project project) { public ClassPathLibrarySourcesLoader(@NotNull Project project) {
this.project = project; this.project = project;