From 8f5b3b58de420a54c12acdf92d9cdd156b451f05 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 8 Jan 2015 21:20:12 +0300 Subject: [PATCH] Rename package jet -> kotlin in util, util-runtime org.jetbrains.jet.config -> org.jetbrains.kotlin.config org.jetbrains.jet.utils -> org.jetbrains.kotlin.utils Also move coreLib.kt to package 'org.jetbrains.kotlin.utils' Original commit: f37e2f173d3908469f614494b70427cb8ec41d16 --- .../src/org/jetbrains/kotlin/jps/build/JpsUtils.java | 2 +- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 12 ++++++------ .../build/KotlinBuilderModuleScriptGenerator.java | 2 +- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- .../jps/build/AbstractKotlinJpsBuildTestCase.java | 2 +- .../kotlin/jps/build/KotlinJpsBuildTest.java | 2 +- .../kotlin/jps/build/classFilesComparison.kt | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java index 4492c006cec..86562fc6785 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.LibraryUtils; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.model.java.JpsJavaClasspathKind; import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; @@ -26,6 +25,7 @@ import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.JpsLibraryRoot; import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.utils.LibraryUtils; import java.util.Set; 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 53a80307bd0..a643d8fddf7 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 @@ -26,12 +26,12 @@ 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 -import org.jetbrains.jet.config.Services -import org.jetbrains.jet.config.IncrementalCompilation +import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider -import org.jetbrains.jet.utils.PathUtil +import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.builders.DirtyFilesHolder import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor @@ -46,7 +46,7 @@ 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 -import org.jetbrains.jet.utils.keysToMap +import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import com.intellij.openapi.diagnostic.Logger import org.jetbrains.org.objectweb.asm.ClassReader @@ -55,7 +55,7 @@ import com.intellij.util.containers.MultiMap 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 +import org.jetbrains.kotlin.utils.LibraryUtils public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -173,7 +173,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), { className -> className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") - || className == "org.jetbrains.jet.config.Services" + || className == "org.jetbrains.kotlin.config.Services" }, compilerServices ) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 89d695eab4e..cd90906e6c8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -22,7 +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.config.IncrementalCompilation; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; @@ -38,6 +37,7 @@ 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.config.IncrementalCompilation; import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder; import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilderFactory; import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilderFactory; diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 15f6dd75629..54c7769a8af 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -26,12 +26,12 @@ import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.jet.config.IncrementalCompilation +import org.jetbrains.kotlin.config.IncrementalCompilation import java.util.ArrayList import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import kotlin.test.fail import java.util.HashMap -import org.jetbrains.jet.utils.keysToMap +import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.jps.incremental.messages.BuildMessage import kotlin.test.assertFalse import java.util.regex.Pattern diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index 3c3ab6ccd8e..2d58b1bf060 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.builders.JpsBuildTestCase; import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.JpsModuleRootModificationUtil; @@ -33,6 +32,7 @@ import org.jetbrains.jps.model.library.JpsTypedLibrary; import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; import java.io.IOException; diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 071e50a59cf..d0fa9d3b9ae 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.AsmUtil; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.builders.impl.BuildDataPathsImpl; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt index b12ee084c48..f5cbc3d3be1 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt @@ -22,7 +22,7 @@ import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor import java.io.PrintWriter import org.jetbrains.org.objectweb.asm.ClassReader import java.io.StringWriter -import org.jetbrains.jet.utils.Printer +import org.jetbrains.kotlin.utils.Printer import com.google.common.io.Files import com.google.common.hash.Hashing import com.intellij.openapi.util.io.FileUtil