Rename package jet -> kotlin in jps-plugin

org.jetbrains.jet.jps -> org.jetbrains.kotlin.jps

.idea/runConfigurations/Incremental_Compilation_Tests.xml

@@ -4,7 +4,7 @@
     <module name="jps-plugin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.jet.jps.build" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.jps.build" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="pattern" />
@@ -18,8 +18,8 @@
     </option>
     <envs />
     <patterns>
-      <pattern testClass="org.jetbrains.jet.jps.build.IncrementalJpsTestGenerated" />
-      <pattern testClass="org.jetbrains.jet.jps.build.IncrementalCacheVersionChangedTest" />
+      <pattern testClass="org.jetbrains.kotlin.jps.build.IncrementalJpsTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.jps.build.IncrementalCacheVersionChangedTest" />
     </patterns>
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -110,7 +110,7 @@ import org.jetbrains.jet.plugin.stubs.AbstractMultiFileHighlightingTest
 import org.jetbrains.jet.cfg.AbstractPseudoValueTest
 import org.jetbrains.jet.plugin.structureView.AbstractKotlinFileStructureTest
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest
-import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest
+import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest
 import org.jetbrains.jet.asJava.AbstractKotlinLightClassTest
 import org.jetbrains.jet.lang.resolve.java.AbstractJavaTypeSubstitutorTest
 import org.jetbrains.jet.plugin.intentions.declarations.AbstractJoinLinesTest

jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java

@@ -18,10 +18,10 @@ package org.jetbrains.kotlin.jps.build.kannotator;
 
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.jps.build.AbstractKotlinJpsBuildTestCase;
 import org.jetbrains.jps.builders.BuildResult;
 import org.jetbrains.jps.model.module.JpsModule;
 import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
+import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase;
 
 import java.io.File;
 

jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService

@@ -1 +1 @@
-org.jetbrains.jet.jps.build.KotlinBuilderService
+org.jetbrains.kotlin.jps.build.KotlinBuilderService

jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension

@@ -1 +1 @@
-org.jetbrains.jet.jps.model.KotlinModelSerializerService
+org.jetbrains.kotlin.jps.model.KotlinModelSerializerService

jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.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.jps;
+package org.jetbrains.kotlin.jps;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;

jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
@@ -66,4 +66,4 @@ class JpsJsModuleUtils {
             }
         });
     }
-}
+}

jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.utils.LibraryUtils;

jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.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.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.io.FileUtil
@@ -28,8 +28,8 @@ import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants
 import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl
 import org.jetbrains.jet.config.Services
 import org.jetbrains.jet.config.IncrementalCompilation
-import org.jetbrains.jet.jps.JpsKotlinCompilerSettings
-import org.jetbrains.jet.jps.incremental.*
+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.jps.ModuleChunk

jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
@@ -46,7 +46,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
-import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies;
+import static org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies;
 import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProcessor;
 import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProvider;
 

jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.incremental.BuilderService;

jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceFileCollector.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;

jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.incremental
+package org.jetbrains.kotlin.jps.incremental
 
-import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl.RecompilationDecision.*
+import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.*
 import java.io.File
 import com.intellij.util.io.PersistentHashMap
 import java.io.DataOutput

jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.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,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.incremental
+package org.jetbrains.kotlin.jps.incremental
 
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider
 import org.jetbrains.jps.incremental.ModuleBuildTarget
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache
-import kotlin.properties.Delegates
 
 public class IncrementalCacheProviderImpl(caches: Map<ModuleBuildTarget, IncrementalCacheImpl>): IncrementalCacheProvider {
     private val idToCache = caches.mapKeys { it.key.getId()!! }
@@ -28,4 +27,3 @@ public class IncrementalCacheProviderImpl(caches: Map<ModuleBuildTarget, Increme
         return idToCache[moduleId]!!
     }
 }
-

jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.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.jps.incremental
+package org.jetbrains.kotlin.jps.incremental
 
 import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader

jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.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,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.model;
+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.jet.jps.JpsKotlinCompilerSettings;
 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;

jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.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,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.model;
+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.jet.jps.JpsKotlinCompilerSettings;
 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;
@@ -45,4 +45,4 @@ class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerialize
     @Override
     public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) {
     }
-}
+}

jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.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,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.model;
+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.jet.jps.JpsKotlinCompilerSettings;
 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;

jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.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,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.model;
+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.jet.jps.JpsKotlinCompilerSettings;
 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_SECTION;
 import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
+import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
 
 class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer {
     KotlinCompilerSettingsSerializer() {

jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinModelSerializerService.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.jps.model;
+package org.jetbrains.kotlin.jps.model;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension;

jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.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.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.builders.JpsBuildTestCase
 import kotlin.properties.Delegates

jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;

jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.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,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.builders.impl.BuildDataPathsImpl
 import java.io.File
 import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
-import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl
+import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl
 import kotlin.test.assertTrue
-import org.jetbrains.jet.jps.incremental.CacheFormatVersion
+import org.jetbrains.kotlin.jps.incremental.CacheFormatVersion
 
 public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() {
     fun testCacheVersionChanged() {
@@ -43,4 +43,4 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() {
         assertTrue(cacheVersionFile.exists())
         cacheVersionFile.writeText("777")
     }
-}
+}

jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;

jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.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,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.LightVirtualFile;
-import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.io.ZipUtil;
 import kotlin.KotlinPackage;

jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.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.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.builders.JpsBuildTestCase
 import com.intellij.util.PathUtil

jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.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.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import java.io.File
 import org.junit.Assert.*
@@ -28,14 +28,13 @@ import com.google.common.hash.Hashing
 import com.intellij.openapi.util.io.FileUtil
 import com.google.common.collect.Sets
 import java.util.HashSet
-import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
 import org.jetbrains.jet.descriptors.serialization.BitEncoding
 import org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf
 import com.google.protobuf.ExtensionRegistry
 import java.io.ByteArrayInputStream
 import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf
 import java.util.Arrays
-import org.jetbrains.jet.jps.incremental.LocalFileKotlinClass
+import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass
 import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind
 import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind