From 98faeb864764f97ba57c74fc5bb296c082cc74bd 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 --- .../compilerRunner}/ArgumentUtils.java | 4 ++-- .../compilerRunner}/CompilerEnvironment.java | 6 +++--- .../compilerRunner}/CompilerOutputParser.java | 4 ++-- .../compilerRunner}/CompilerRunnerConstants.java | 4 ++-- .../compilerRunner}/CompilerRunnerUtil.java | 4 ++-- .../compilerRunner}/KotlinCompilerRunner.java | 6 +++--- .../compilerRunner}/OutputItemsCollector.java | 4 ++-- .../compilerRunner}/OutputItemsCollectorImpl.java | 4 ++-- .../compilerRunner}/SimpleOutputItem.java | 4 ++-- .../compiler => kotlin/config}/CompilerSettings.kt | 4 ++-- .../config}/SettingConstants.java | 4 ++-- .../jet/plugin/compiler/JetCompilerManager.java | 4 ++-- .../Kotlin2JsCompilerArgumentsHolder.java | 4 ++-- .../Kotlin2JvmCompilerArgumentsHolder.java | 4 ++-- .../KotlinCommonCompilerArgumentsHolder.java | 4 ++-- .../KotlinCompilerConfigurableTab.java | 2 +- .../configuration/KotlinCompilerSettings.java | 6 +++--- .../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 +++--- 23 files changed, 53 insertions(+), 53 deletions(-) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/ArgumentUtils.java (97%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/CompilerEnvironment.java (95%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/CompilerOutputParser.java (98%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/CompilerRunnerConstants.java (89%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/CompilerRunnerUtil.java (97%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/KotlinCompilerRunner.java (98%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/OutputItemsCollector.java (89%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/OutputItemsCollectorImpl.java (93%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler/runner => kotlin/compilerRunner}/SimpleOutputItem.java (93%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler => kotlin/config}/CompilerSettings.kt (92%) rename ide-compiler-runner/src/org/jetbrains/{jet/compiler => kotlin/config}/SettingConstants.java (94%) diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/ArgumentUtils.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java similarity index 97% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/ArgumentUtils.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java index 5b7ef0b7fdb..59eb0060548 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/ArgumentUtils.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerEnvironment.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java similarity index 95% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerEnvironment.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java index 8a610827a72..bc55d0e8c3c 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerEnvironment.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.messages.MessageCollector; @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.preloading.ClassCondition; import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; -public final class CompilerEnvironment { +public class CompilerEnvironment { @NotNull public static CompilerEnvironment getEnvironmentFor( @NotNull KotlinPaths kotlinPaths, diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerOutputParser.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java similarity index 98% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerOutputParser.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java index a87e983be9c..b20af193adb 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerOutputParser.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerConstants.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerConstants.java similarity index 89% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerConstants.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerConstants.java index 2d688d3dc68..9d4bea67eb7 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerConstants.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; public class CompilerRunnerConstants { public static final String KOTLIN_COMPILER_NAME = "Kotlin"; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java similarity index 97% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index 788d3cfac0d..f3b5d8e43cb 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java similarity index 98% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index db45dc21a49..fdccf0cb093 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; @@ -30,7 +30,7 @@ import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.cli.common.messages.MessageCollectorUtil; -import org.jetbrains.jet.compiler.CompilerSettings; +import org.jetbrains.kotlin.config.CompilerSettings; import java.io.*; import java.util.Collection; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/OutputItemsCollector.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java similarity index 89% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/OutputItemsCollector.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java index b433606854d..a05fe540e47 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/OutputItemsCollector.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; import java.io.File; import java.util.Collection; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/OutputItemsCollectorImpl.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java similarity index 93% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/OutputItemsCollectorImpl.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java index 32d86c95816..b2b40cd1811 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/OutputItemsCollectorImpl.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/SimpleOutputItem.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java similarity index 93% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/SimpleOutputItem.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java index 970df11eefe..ed9c716f7cb 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/SimpleOutputItem.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler.runner; +package org.jetbrains.kotlin.compilerRunner; import org.jetbrains.annotations.NotNull; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/CompilerSettings.kt b/ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerSettings.kt similarity index 92% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/CompilerSettings.kt rename to ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerSettings.kt index dbb2fce5c2e..f1b5b37929e 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/CompilerSettings.kt +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler +package org.jetbrains.kotlin.config public class CompilerSettings { public var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/SettingConstants.java b/ide-compiler-runner/src/org/jetbrains/kotlin/config/SettingConstants.java similarity index 94% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/SettingConstants.java rename to ide-compiler-runner/src/org/jetbrains/kotlin/config/SettingConstants.java index afac67c74cb..c3e82c5b17c 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/SettingConstants.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/config/SettingConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler; +package org.jetbrains.kotlin.config; import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR; diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java index 0200ce2988a..694477146db 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java @@ -38,8 +38,8 @@ import java.io.PrintStream; import java.io.PrintWriter; import java.util.Set; -import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX; -import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.KOTLIN_COMPILER_NAME; +import static org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX; +import static org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.KOTLIN_COMPILER_NAME; public class JetCompilerManager implements ProjectComponent { private static final Logger LOG = Logger.getInstance(JetCompilerManager.class); diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java index cb4220b9417..339e730abd5 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java @@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; @State( name = KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION, diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java index 58cc7c84dd9..59898cbd637 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java @@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; @State( name = KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION, diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java index 7454b9b29c3..da6e216d189 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java @@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; @State( name = KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION, diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java index 150884b877a..e9a95325ce4 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java @@ -32,8 +32,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jet.plugin.JetBundle; +import org.jetbrains.kotlin.config.CompilerSettings; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java index 60f4c5baccf..52e71abb86d 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java @@ -19,10 +19,10 @@ package org.jetbrains.jet.plugin.compiler.configuration; import com.intellij.openapi.components.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.compiler.CompilerSettings; +import org.jetbrains.kotlin.config.CompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; @State( name = KOTLIN_COMPILER_SETTINGS_SECTION, diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java b/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java index 7af9b0f7551..738b89f51e0 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java +++ b/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-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b3c5e815feb..2e79eda708c 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/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-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index 502d34f9266..a2200c34dd7 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java +++ b/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-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index 545a80396c8..ad810fdc2e8 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java +++ b/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-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java b/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 173b8fcc9e7..563ee48671a 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java +++ b/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-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java b/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java index 109bdef9672..c27f8cbbc6e 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java +++ b/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() {