Rename jet -> kotlin and regroup files in serialization

org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization

Deserialization goes to subpackage deserialization, built-ins-related stuff
goes to subpackage builtins

core/serialization/src/builtins.proto

@@ -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.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.builtins;
 
 import "core/serialization/src/descriptors.proto";
 

core/serialization/src/descriptors.proto

@@ -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.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 option java_outer_classname = "ProtoBuf";
 option optimize_for = LITE_RUNTIME; // Smaller runtime

core/serialization/src/org/jetbrains/jet/descriptors/serialization/BuiltInsProtoBuf.java

@@ -1,80 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization/src/builtins.proto
-
-package org.jetbrains.jet.descriptors.serialization;
-
-public final class BuiltInsProtoBuf {
-  private BuiltInsProtoBuf() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.className);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.callableAnnotation);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.parameterAnnotation);
-  }
-  public static final int CLASS_NAME_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Package { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package,
-      java.util.List<java.lang.Integer>> className = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package.getDefaultInstance(),
-        null,
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.INT32,
-        true);
-  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Class { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation>> classAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation>> callableAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter,
-      java.util.List<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation>> parameterAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-
-  static {
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}

core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.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.descriptors.serialization
+package org.jetbrains.kotlin.serialization
 
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor
 import org.jetbrains.jet.lang.resolve.constants.*
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.jet.lang.types.JetType
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 

core/serialization/src/org/jetbrains/kotlin/serialization/ClassData.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,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.ByteArrayInputStream;

core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.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.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;

core/serialization/src/org/jetbrains/kotlin/serialization/Flags.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.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import com.google.protobuf.Internal;
 import org.jetbrains.annotations.NotNull;

core/serialization/src/org/jetbrains/kotlin/serialization/Interner.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.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import gnu.trove.TObjectHashingStrategy;
 import gnu.trove.TObjectIntHashMap;

core/serialization/src/org/jetbrains/kotlin/serialization/NameSerializationUtil.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,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.IOException;

core/serialization/src/org/jetbrains/kotlin/serialization/PackageData.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,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.ByteArrayInputStream;

core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.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.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;

core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.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,17 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import gnu.trove.TObjectHashingStrategy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
 import java.util.List;
 
-import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
+import static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
 
 public class StringTable {
     public static final TObjectHashingStrategy<QualifiedName.Builder> QUALIFIED_NAME_BUILDER_HASHING =

core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java

@@ -0,0 +1,80 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/serialization/src/builtins.proto
+
+package org.jetbrains.kotlin.serialization.builtins;
+
+public final class BuiltInsProtoBuf {
+  private BuiltInsProtoBuf() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.className);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.callableAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.parameterAnnotation);
+  }
+  public static final int CLASS_NAME_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Package { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Package,
+      java.util.List<java.lang.Integer>> className = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(),
+        null,
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.INT32,
+        true);
+  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
+      java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Annotation>> classAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
+      java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Annotation>> callableAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
+      java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Annotation>> parameterAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+
+  static {
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.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.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 public enum AnnotatedCallableKind {
     FUNCTION,

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.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.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
 
 import java.util.List;
 

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.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,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.constants.*
@@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.types.ErrorUtils
 import org.jetbrains.jet.lang.descriptors.ClassKind
 import org.jetbrains.jet.lang.types.Variance
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
 public class AnnotationDeserializer(private val module: ModuleDescriptor) {
     private val builtIns: KotlinBuiltIns
@@ -64,7 +65,7 @@ public class AnnotationDeserializer(private val module: ModuleDescriptor) {
 
     private fun resolveValue(
             expectedType: JetType,
-            value: ProtoBuf.Annotation.Argument.Value,
+            value: Value,
             nameResolver: NameResolver
     ): CompileTimeConstant<*> {
         val result = when (value.getType()) {

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.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,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.name.ClassId;
+import org.jetbrains.kotlin.serialization.ClassData;
 
 public interface ClassDataFinder {
     @Nullable

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 import org.jetbrains.jet.lang.resolve.name.ClassId
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.ClassData
 
 public class ClassDeserializer(private val components: DeserializationComponents) {
     private val classes: (ClassKey) -> DeserializedClassDescriptor? =

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.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.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.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,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.types.FlexibleTypeCapabilities
 
 trait FlexibleTypeCapabilitiesDeserializer {
@@ -27,4 +26,4 @@ trait FlexibleTypeCapabilitiesDeserializer {
     }
 
     fun capabilitiesById(id: String): FlexibleTypeCapabilities?
-}
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.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,17 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.*
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
-import org.jetbrains.jet.descriptors.serialization.descriptors.*
+import org.jetbrains.kotlin.serialization.*
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.*
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.impl.*
 import org.jetbrains.jet.lang.resolve.DescriptorFactory
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind.*
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.*
 
 public class MemberDeserializer(private val c: DeserializationContext) {
     public fun loadCallable(proto: Callable): CallableMemberDescriptor {

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.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.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -22,8 +22,9 @@ import org.jetbrains.jet.lang.resolve.name.ClassId;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
 
-import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
+import static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
 
 public class NameResolver {
     private final ProtoBuf.StringTable strings;

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization
 
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.resolve.name.FqName
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
 
 public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqName: FqName?) {

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.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,15 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedTypeParameterDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeParameterDescriptor
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
 import org.jetbrains.jet.lang.types.*
 import org.jetbrains.kotlin.utils.*
-
 import java.util.LinkedHashMap
 
 public class TypeDeserializer(

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.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.descriptors.serialization.context
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.storage.StorageManager
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.descriptors.serialization.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationAndConstantLoader
 import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.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.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import org.jetbrains.kotlin.storage.StorageManager

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.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,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 
 public trait DeserializedCallableMemberDescriptor: CallableMemberDescriptor {
     public val proto: ProtoBuf.Callable
     public val nameResolver: NameResolver
-}
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.context.*
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.impl.AbstractClassDescriptor
@@ -29,14 +29,12 @@ import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass
 import org.jetbrains.jet.lang.types.AbstractClassTypeConstructor
 import org.jetbrains.jet.lang.types.JetType
-import org.jetbrains.jet.descriptors.serialization
+import org.jetbrains.kotlin.serialization.deserialization
 import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName
-import org.jetbrains.jet.descriptors.serialization.classKind
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
 import java.util.*
-import org.jetbrains.jet.descriptors.serialization.NameResolver
 
 public class DeserializedClassDescriptor(
         outerContext: DeserializationContext,
@@ -46,9 +44,9 @@ public class DeserializedClassDescriptor(
         outerContext.storageManager,
         nameResolver.getClassId(classProto.getFqName()).getRelativeClassName().shortName()
 ) {
-    private val modality = serialization.modality(Flags.MODALITY.get(classProto.getFlags()))
-    private val visibility = serialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
-    private val kind = classKind(Flags.CLASS_KIND.get(classProto.getFlags()))
+    private val modality = deserialization.modality(Flags.MODALITY.get(classProto.getFlags()))
+    private val visibility = deserialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
+    private val kind = deserialization.classKind(Flags.CLASS_KIND.get(classProto.getFlags()))
     private val isInner = Flags.INNER.get(classProto.getFlags())
 
     val c = outerContext.childContext(this, classProto.getTypeParameterList(), nameResolver)

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.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,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
 import java.util.*
 
 public abstract class DeserializedMemberScope protected(

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.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,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
 import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
 public open class DeserializedPackageMemberScope(
         packageDescriptor: PackageFragmentDescriptor,

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.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.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
@@ -22,9 +22,9 @@ import org.jetbrains.jet.lang.descriptors.Modality
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.Visibility
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind
 import org.jetbrains.jet.lang.descriptors.SourceElement
 
@@ -52,4 +52,4 @@ public class DeserializedPropertyDescriptor(
         return DeserializedPropertyDescriptor(
                 newOwner, original, getAnnotations(), newModality, newVisibility, isVar(), getName(), kind, proto, nameResolver)
     }
-}
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.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,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization.descriptors;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.Flags;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.SerializationPackage;
+import org.jetbrains.kotlin.serialization.Flags;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
@@ -98,7 +98,7 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
                 null,
                 annotations,
                 nameResolver.getName(proto.getName()),
-                SerializationPackage.memberKind(Flags.MEMBER_KIND.get(proto.getFlags())),
+                DeserializationPackage.memberKind(Flags.MEMBER_KIND.get(proto.getFlags())),
                 proto,
                 nameResolver
         );

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.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,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization.descriptors;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.SerializationPackage;
-import org.jetbrains.jet.descriptors.serialization.TypeDeserializer;
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage;
+import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext;
 import org.jetbrains.jet.lang.descriptors.SourceElement;
 import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
@@ -38,7 +38,7 @@ public class DeserializedTypeParameterDescriptor extends AbstractLazyTypeParamet
         super(c.getStorageManager(),
               c.getContainingDeclaration(),
               c.getNameResolver().getName(proto.getName()),
-              SerializationPackage.variance(proto.getVariance()),
+              DeserializationPackage.variance(proto.getVariance()),
               proto.getReified(),
               index,
               SourceElement.NO_SOURCE);

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.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.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.resolve.name.Name
@@ -40,4 +40,4 @@ public fun ModuleDescriptor.findClassAcrossModuleDependencies(classId: ClassId):
         result = findInnerClass(result, name) ?: return null
     }
     return result
-}
+}

core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.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,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 import org.jetbrains.jet.lang.descriptors.Modality
 import org.jetbrains.jet.lang.descriptors.Visibilities
 import org.jetbrains.jet.lang.descriptors.ClassKind
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter
+import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter
 import org.jetbrains.jet.lang.types.Variance
 
-fun memberKind(memberKind: Callable.MemberKind) = when (memberKind) {
+fun memberKind(memberKind: ProtoBuf.Callable.MemberKind) = when (memberKind) {
     ProtoBuf.Callable.MemberKind.DECLARATION -> CallableMemberDescriptor.Kind.DECLARATION
     ProtoBuf.Callable.MemberKind.FAKE_OVERRIDE -> CallableMemberDescriptor.Kind.FAKE_OVERRIDE
     ProtoBuf.Callable.MemberKind.DELEGATION -> CallableMemberDescriptor.Kind.DELEGATION