From dad946b58d249c01e52d94930c0dc2506f3808f2 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 30 Jul 2012 15:47:40 +0400 Subject: [PATCH] Revert changes to ClassPathLibrary* Cosmetics also. --- .../k2js/config/ClassPathLibraryDefintionsConfig.java | 3 ++- .../k2js/config/ClassPathLibrarySourcesLoader.java | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibraryDefintionsConfig.java b/js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibraryDefintionsConfig.java index 973f8ff4060..f85b5f10d4d 100644 --- a/js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibraryDefintionsConfig.java +++ b/js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibraryDefintionsConfig.java @@ -26,8 +26,9 @@ import java.util.List; * A Config implementation which is configured with a directory to find the standard library names from */ public class ClassPathLibraryDefintionsConfig extends Config { + // used by maven build @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) { super(project, moduleId, version); diff --git a/js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibrarySourcesLoader.java b/js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibrarySourcesLoader.java index ea9ad2bad3d..5b9394f5a4d 100644 --- a/js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibrarySourcesLoader.java +++ b/js/js.translator/src/org/jetbrains/k2js/config/ClassPathLibrarySourcesLoader.java @@ -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 */ public class ClassPathLibrarySourcesLoader { + + // used by maven build @NotNull - private static final String META_INF_SERVICES_FILE = "META-INF/services/org.jetbrains.kotlin.js.librarySource"; - @NotNull private final Project project; + public static final String META_INF_SERVICES_FILE = "META-INF/services/org.jetbrains.kotlin.js.librarySource"; + @NotNull + private final Project project; public ClassPathLibrarySourcesLoader(@NotNull Project project) { this.project = project;