From 5f05f0d678dc163cdd2787272ef1011a14d10d6b Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Mon, 10 Aug 2015 16:05:53 +0300
Subject: [PATCH] Move Module to util method

---
 .../org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt    | 2 +-
 .../kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java    | 2 +-
 .../kotlin/modules/xml/AbstractModuleXmlParserTest.java         | 2 +-
 .../common => util/src/org/jetbrains/kotlin}/modules/Module.kt  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename compiler/{cli/cli-common/src/org/jetbrains/kotlin/cli/common => util/src/org/jetbrains/kotlin}/modules/Module.kt (95%)

diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt
index 956c5abcc8e..fcfafe57930 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt
@@ -22,7 +22,7 @@ public class ModuleBuilder(
         private val name: String,
         private val outputDir: String,
         private val type: String
-) : Module {
+) : org.jetbrains.kotlin.modules.Module {
     private val sourceFiles = ArrayList<String>()
     private val classpathRoots = ArrayList<String>()
     private val javaSourceRoots = ArrayList<String>()
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
index b376be52dfb..5be89bda675 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.cli.common.CompilerPlugin;
 import org.jetbrains.kotlin.cli.common.CompilerPluginContext;
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport;
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
-import org.jetbrains.kotlin.cli.common.modules.Module;
+import org.jetbrains.kotlin.modules.Module;
 import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage;
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
 import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys;
diff --git a/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java
index c2d594b9bcf..7402d3d0688 100644
--- a/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation;
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity;
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
 import org.jetbrains.kotlin.cli.common.messages.MessageRenderer;
-import org.jetbrains.kotlin.cli.common.modules.Module;
+import org.jetbrains.kotlin.modules.Module;
 import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData;
 import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser;
 import org.jetbrains.kotlin.test.JetTestUtils;
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/Module.kt b/compiler/util/src/org/jetbrains/kotlin/modules/Module.kt
similarity index 95%
rename from compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/Module.kt
rename to compiler/util/src/org/jetbrains/kotlin/modules/Module.kt
index 7c238d55a3c..9b297639f40 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/Module.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/modules/Module.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.cli.common.modules
+package org.jetbrains.kotlin.modules
 
 public interface Module {
     public fun getModuleName(): String