From 286e8861cd297b51e9cd18bbc1ec7cb1b9457ad4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 5 Jan 2015 19:43:16 +0300 Subject: [PATCH] Move module script-related code to org.jetbrains.kotlin.modules Original commit: 36feb4dfdc8ccb577a43216c2e001900f5e9f298 --- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 4bf4e25a006..4152b19420a 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -22,9 +22,6 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder; -import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilderFactory; -import org.jetbrains.jet.compiler.runner.KotlinModuleXmlBuilderFactory; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; @@ -41,14 +38,17 @@ import org.jetbrains.jps.model.module.JpsDependencyElement; import org.jetbrains.jps.model.module.JpsLibraryDependency; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsSdkDependency; +import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder; +import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilderFactory; +import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilderFactory; import java.io.File; import java.io.IOException; import java.util.*; -import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProcessor; -import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProvider; import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies; +import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProcessor; +import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProvider; public class KotlinBuilderModuleScriptGenerator {