From fb4beaa4ed5897c8c43d46cfd4abac5abf19ee92 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 6 Jan 2015 04:06:29 +0300 Subject: [PATCH] Rename package jet -> kotlin in ide-compiler-runner org.jetbrains.jet.compiler.runner -> org.jetbrains.kotlin.compilerRunner org.jetbrains.jet.compiler -> org.jetbrains.kotlin.config Original commit: 98faeb864764f97ba57c74fc5bb296c082cc74bd --- .../kotlin/jps/JpsKotlinCompilerSettings.java | 2 +- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 14 +++++++------- .../Kotlin2JsCompilerArgumentsSerializer.java | 4 ++-- .../Kotlin2JvmCompilerArgumentsSerializer.java | 4 ++-- .../KotlinCommonCompilerArgumentsSerializer.java | 4 ++-- .../model/KotlinCompilerSettingsSerializer.java | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java index 7af9b0f7551..738b89f51e0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java @@ -20,11 +20,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.ex.JpsElementBase; import org.jetbrains.jps.model.ex.JpsElementChildRoleBase; +import org.jetbrains.kotlin.config.CompilerSettings; public class JpsKotlinCompilerSettings extends JpsElementBase { static final JpsElementChildRole ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b3c5e815feb..2e79eda708c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -23,9 +23,9 @@ import org.jetbrains.jet.cli.common.KotlinVersion import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity import org.jetbrains.jet.cli.common.messages.MessageCollector -import org.jetbrains.jet.compiler.runner.CompilerEnvironment -import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants -import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl +import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment +import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants +import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.jet.config.Services import org.jetbrains.jet.config.IncrementalCompilation import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings @@ -43,9 +43,9 @@ import java.io.File import java.util.* import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.* -import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX -import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler -import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler +import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX +import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler +import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import com.intellij.openapi.diagnostic.Logger @@ -54,7 +54,7 @@ import org.jetbrains.jps.builders.java.JavaBuilderUtil import com.intellij.util.containers.MultiMap import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject -import org.jetbrains.jet.compiler.runner.SimpleOutputItem +import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem import org.jetbrains.jet.utils.LibraryUtils public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index 502d34f9266..a2200c34dd7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java @@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { Kotlin2JsCompilerArgumentsSerializer() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index 545a80396c8..ad810fdc2e8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java @@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { Kotlin2JvmCompilerArgumentsSerializer() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 173b8fcc9e7..563ee48671a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java @@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { KotlinCommonCompilerArgumentsSerializer() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java index 109bdef9672..c27f8cbbc6e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; +import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer { KotlinCompilerSettingsSerializer() {