diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index a17c446bfb6..1d79a93f201 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.builtins; -import kotlin.DeprecationLevel; import kotlin.SetsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; @@ -393,8 +392,8 @@ public abstract class KotlinBuiltIns { } @Nullable - public ClassDescriptor getDeprecationLevelEnumEntry(@NotNull DeprecationLevel level) { - return getEnumEntry(getDeprecationLevelEnum(), level.name()); + public ClassDescriptor getDeprecationLevelEnumEntry(@NotNull String level) { + return getEnumEntry(getDeprecationLevelEnum(), level); } @NotNull diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt index 21ccd0c1946..0f9df4e727c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.Variance public fun KotlinBuiltIns.createDeprecatedAnnotation( message: String, replaceWith: String, - level: DeprecationLevel = DeprecationLevel.WARNING + level: String = "WARNING" ): AnnotationDescriptor { val deprecatedAnnotation = deprecatedAnnotation val parameters = deprecatedAnnotation.unsubstitutedPrimaryConstructor!!.valueParameters @@ -52,7 +52,7 @@ public fun KotlinBuiltIns.createDeprecatedAnnotation( SourceElement.NO_SOURCE ) ), - parameters["level"] to EnumValue(getDeprecationLevelEnumEntry(level)!!) + parameters["level"] to EnumValue(getDeprecationLevelEnumEntry(level) ?: error("Deprecation level $level not found")) ), SourceElement.NO_SOURCE) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java index 23f27053916..6a89edca8e2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve; -import kotlin.DeprecationLevel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; @@ -133,11 +132,9 @@ public class DescriptorFactory { @NotNull public static PropertyDescriptor createEnumValuesProperty(@NotNull ClassDescriptor enumClass) { - AnnotationsImpl annotations = AnnotationsImpl.createWithNoTarget( - AnnotationUtilKt.createDeprecatedAnnotation(getBuiltIns(enumClass), - "Use 'values()' function instead", "this.values()", - DeprecationLevel.ERROR) - ); + AnnotationsImpl annotations = AnnotationsImpl.createWithNoTarget(AnnotationUtilKt.createDeprecatedAnnotation( + getBuiltIns(enumClass), "Use 'values()' function instead", "this.values()", "ERROR" + )); PropertyDescriptorImpl values = PropertyDescriptorImpl.create(