From 82d7ed7cf90225681abf215413e021a7437ea20f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 8 Jan 2015 20:30:27 +0300 Subject: [PATCH] Rename package jet -> kotlin in cli, cli-common org.jetbrains.jet.cli -> org.jetbrains.kotlin.cli Also fix some minor warnings Original commit: 8ca803775fef30305a8251292215aefcb5ff2a86 --- .../kotlin/jps/JpsKotlinCompilerSettings.java | 6 +++--- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 14 +++++++------- .../Kotlin2JsCompilerArgumentsSerializer.java | 2 +- .../Kotlin2JvmCompilerArgumentsSerializer.java | 2 +- .../KotlinCommonCompilerArgumentsSerializer.java | 2 +- 5 files changed, 13 insertions(+), 13 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 738b89f51e0..6095da08422 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java @@ -17,9 +17,9 @@ package org.jetbrains.kotlin.jps; 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.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.ex.JpsElementBase; 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 2e79eda708c..53a80307bd0 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 @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.Key import com.intellij.openapi.util.io.FileUtil import gnu.trove.THashSet -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.kotlin.cli.common.KotlinVersion +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.compilerRunner.CompilerEnvironment import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl @@ -41,8 +41,8 @@ import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage 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.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler @@ -52,7 +52,7 @@ import com.intellij.openapi.diagnostic.Logger import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.jps.builders.java.JavaBuilderUtil import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem import org.jetbrains.jet.utils.LibraryUtils 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 a2200c34dd7..10ead8134d8 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 @@ -19,7 +19,7 @@ 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.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; 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 ad810fdc2e8..09f10c25233 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 @@ -19,7 +19,7 @@ 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.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; 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 563ee48671a..70c60de3245 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 @@ -19,7 +19,7 @@ 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.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;