From 1f10cbb0d567e05e933f82f85a9c3bd2810a7f98 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 12 Feb 2015 19:33:33 +0300
Subject: [PATCH] Moved constant to idea module and removed redundant
 dependency.

---
 idea/idea-jps-common/idea-jps-common.iml                      | 1 -
 .../src/org/jetbrains/kotlin/config/SettingConstants.java     | 3 ---
 .../compiler/configuration/BaseKotlinCompilerSettings.java    | 4 ++++
 .../configuration/Kotlin2JsCompilerArgumentsHolder.java       | 2 +-
 .../configuration/Kotlin2JvmCompilerArgumentsHolder.java      | 2 +-
 .../configuration/KotlinCommonCompilerArgumentsHolder.java    | 2 +-
 .../idea/compiler/configuration/KotlinCompilerSettings.java   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idea/idea-jps-common/idea-jps-common.iml b/idea/idea-jps-common/idea-jps-common.iml
index 56fbc16c342..c90834f2d60 100644
--- a/idea/idea-jps-common/idea-jps-common.iml
+++ b/idea/idea-jps-common/idea-jps-common.iml
@@ -7,6 +7,5 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="idea-full" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java
index c3e82c5b17c..1c7aca6064f 100644
--- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java
+++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java
@@ -16,8 +16,6 @@
 
 package org.jetbrains.kotlin.config;
 
-import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR;
-
 public class SettingConstants {
     private SettingConstants() {}
 
@@ -27,5 +25,4 @@ public class SettingConstants {
     public static final String KOTLIN_COMPILER_SETTINGS_SECTION = "KotlinCompilerSettings";
 
     public static final String KOTLIN_COMPILER_SETTINGS_FILE = "kotlinc.xml";
-    public static final String KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + KOTLIN_COMPILER_SETTINGS_FILE;
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.java
index b8a4b02c37e..bd5669bf95a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.java
@@ -22,8 +22,12 @@ import com.intellij.util.xmlb.XmlSerializer;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.config.SettingConstants;
+
+import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR;
 
 public abstract class BaseKotlinCompilerSettings<T> implements PersistentStateComponent<Element> {
+    public static final String KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
 
     private static final SkipDefaultValuesSerializationFilters SKIP_DEFAULT_VALUES = new SkipDefaultValuesSerializationFilters();
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java
index 937cbfde0e2..bedcefcdcbf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments;
 
-import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
+import static org.jetbrains.kotlin.idea.compiler.configuration.BaseKotlinCompilerSettings.KOTLIN_COMPILER_SETTINGS_PATH;
 import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION;
 
 @State(
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java
index 28fbcfad89d..9c2b35a7fdf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments;
 
-import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
+import static org.jetbrains.kotlin.idea.compiler.configuration.BaseKotlinCompilerSettings.KOTLIN_COMPILER_SETTINGS_PATH;
 import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION;
 
 @State(
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java
index 78bd24cd0af..3ab45e1459e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments;
 
 import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION;
-import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
+import static org.jetbrains.kotlin.idea.compiler.configuration.BaseKotlinCompilerSettings.KOTLIN_COMPILER_SETTINGS_PATH;
 
 @State(
     name = KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION,
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.java
index 97244ef9b5c..52749ed8f9d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.config.CompilerSettings;
 
-import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
+import static org.jetbrains.kotlin.idea.compiler.configuration.BaseKotlinCompilerSettings.KOTLIN_COMPILER_SETTINGS_PATH;
 import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
 
 @State(