From c8fe0080c781292bf0ee4e28b43144208fb25fde Mon Sep 17 00:00:00 2001
From: pTalanov <Pavel.Talanov@jetbrains.com>
Date: Wed, 16 May 2012 17:42:38 +0400
Subject: [PATCH] Fix compilation for maven build

---
 .../src/org/jetbrains/jet/cli/js/K2JSCompiler.java    |  5 +++--
 .../src/org/jetbrains/k2js/config/Config.java         | 11 +++++++++--
 .../jetbrains/kotlin/maven/K2JSCompilerPlugin.java    |  8 +-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
index 6f69093b3dd..c6a4107acc0 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
@@ -120,9 +120,10 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments, K2JSCompile
 
     @NotNull
     private static Config getConfig(@NotNull K2JSCompilerArguments arguments, @NotNull Project project) {
+        EcmaVersion ecmaVersion = EcmaVersion.fromString(arguments.target);
         if (arguments.libzip == null) {
-            return Config.getEmptyConfig(project, arguments.target);
+            return Config.getEmptyConfig(project, ecmaVersion);
         }
-        return new ZippedLibrarySourcesConfig(project, arguments.libzip, EcmaVersion.fromString(arguments.target));
+        return new ZippedLibrarySourcesConfig(project, arguments.libzip, ecmaVersion);
     }
 }
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index fafa190127a..a7a0d2aab55 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -33,8 +33,8 @@ import java.util.List;
 public abstract class Config {
 
     @NotNull
-    public static Config getEmptyConfig(@NotNull Project project, @Nullable String target) {
-        return new Config(project, EcmaVersion.fromString(target)) {
+    public static Config getEmptyConfig(@NotNull Project project, @NotNull EcmaVersion ecmaVersion) {
+        return new Config(project, ecmaVersion) {
             @NotNull
             @Override
             protected List<JetFile> generateLibFiles() {
@@ -43,6 +43,13 @@ public abstract class Config {
         };
     }
 
+    //NOTE: used by mvn build
+    @SuppressWarnings("UnusedDeclaration")
+    @NotNull
+    public static Config getEmptyConfig(@NotNull Project project) {
+        return getEmptyConfig(project, EcmaVersion.defaultVersion());
+    }
+
     @NotNull
     protected static final List<String> LIB_FILE_NAMES = Arrays.asList(
             "/core/annotations.kt",
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java
index 9f5d7b4dfec..7e68e648cad 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java
@@ -45,13 +45,7 @@ public class K2JSCompilerPlugin implements CompilerPlugin {
         List<JetFile> sources = context.getFiles();
 
         if (bindingContext != null && sources != null && project != null) {
-            Config config = new Config(project) {
-                @NotNull
-                @Override
-                protected List<JetFile> generateLibFiles() {
-                    return new ArrayList<JetFile>();
-                }
-            };
+            Config config = Config.getEmptyConfig(project);
 
             try {