Move Interner from deserialization to util

This class is not used in core and should not end up in kotlin-reflect.jar

compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java

@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.resolve.MemberComparator;
 import org.jetbrains.kotlin.resolve.constants.ConstantValue;
 import org.jetbrains.kotlin.resolve.constants.NullValue;
 import org.jetbrains.kotlin.types.*;
+import org.jetbrains.kotlin.utils.Interner;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.ByteArrayOutputStream;

compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.types.ErrorUtils;
+import org.jetbrains.kotlin.utils.Interner;
 
 import static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
 

compiler/util/src/org/jetbrains/kotlin/utils/Interner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.serialization;
+package org.jetbrains.kotlin.utils;
 
 import kotlin.KotlinPackage;
 import kotlin.jvm.functions.Function1;
@@ -61,7 +61,7 @@ public final class Interner<T> {
 
     @NotNull
     public List<T> getAllInternedObjects() {
-        return KotlinPackage.toSortedListBy(interned.keySet(), new Function1<T, Integer>() {
+        return KotlinPackage.sortedBy(interned.keySet(), new Function1<T, Integer>() {
             @Override
             public Integer invoke(T key) {
                 return interned.get(key);

generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt

@@ -76,11 +76,11 @@ class GenerateProtoBufCompare {
 
         p.println("import org.jetbrains.kotlin.name.ClassId")
         p.println("import org.jetbrains.kotlin.name.FqName")
-        p.println("import org.jetbrains.kotlin.serialization.Interner")
         p.println("import org.jetbrains.kotlin.serialization.ProtoBuf")
         p.println("import org.jetbrains.kotlin.serialization.deserialization.NameResolver")
         p.println("import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf")
-        p.println("import java.util.EnumSet")
+        p.println("import org.jetbrains.kotlin.utils.Interner")
+        p.println("import java.util.*")
         p.println()
         p.println("/** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */")
         p.println()

jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt

@@ -18,11 +18,11 @@ package org.jetbrains.kotlin.jps.incremental
 
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.serialization.Interner
 import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
-import java.util.EnumSet
+import org.jetbrains.kotlin.utils.Interner
+import java.util.*
 
 /** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */