Replace KotlinPackage legacy facade with corresponding package parts.

This commit is contained in:
Ilya Gorbunov
2015-10-01 22:31:17 +03:00
parent 80e4ba8712
commit 90e5ee8a7e
64 changed files with 214 additions and 206 deletions
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.load.java;
import kotlin.KotlinPackage;
import kotlin.SetsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.name.ClassId;
import org.jetbrains.kotlin.name.FqName;
@@ -93,7 +93,7 @@ public final class JvmAnnotationNames {
// When these annotations appear on a declaration, they are copied to the _type_ of the declaration, becoming type annotations
// See also DescriptorRendererOptions#excludedTypeAnnotationClasses
public static final Set<FqName> ANNOTATIONS_COPIED_TO_TYPES = KotlinPackage.setOf(
public static final Set<FqName> ANNOTATIONS_COPIED_TO_TYPES = SetsKt.setOf(
JETBRAINS_READONLY_ANNOTATION,
JETBRAINS_MUTABLE_ANNOTATION,
JETBRAINS_NOT_NULL_ANNOTATION,
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
import javax.inject.Inject;
import java.util.*;
import static kotlin.KotlinPackage.setOf;
import static kotlin.SetsKt.setOf;
import static org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.Kind.*;
public final class DeserializedDescriptorResolver {