diff --git a/core/builtins/src/kotlin/reflect/_Deprecated.kt b/core/builtins/src/kotlin/reflect/_Deprecated.kt deleted file mode 100644 index 52afa46fb95..00000000000 --- a/core/builtins/src/kotlin/reflect/_Deprecated.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package kotlin.reflect - -@Deprecated("This class will be dropped after M13 because it was a part of an overly complex API. Use KFunction instead") -public interface KTopLevelFunction : KFunction - -@Deprecated("This class will be dropped after M13 because it was a part of an overly complex API. Use KFunction instead") -public interface KTopLevelExtensionFunction - -@Deprecated("This class will be dropped after M13 because it was a part of an overly complex API. Use KFunction instead") -public interface KMemberFunction : KFunction - -@Deprecated("This class will be dropped after M13 because it was a part of an overly complex API. Use KFunction instead") -public interface KLocalFunction : KFunction diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt index c6698c860d4..400b8e57b97 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt @@ -14,7 +14,6 @@ * limitations under the License. */ -@file:Suppress("DEPRECATED_SYMBOL_WITH_MESSAGE") package kotlin.reflect.jvm.internal import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -24,7 +23,8 @@ import java.lang.reflect.Member import java.lang.reflect.Method import java.lang.reflect.Modifier import kotlin.jvm.internal.FunctionImpl -import kotlin.reflect.* +import kotlin.reflect.KFunction +import kotlin.reflect.KotlinReflectionInternalError import kotlin.reflect.jvm.internal.JvmFunctionSignature.* internal open class KFunctionImpl protected constructor( @@ -32,8 +32,7 @@ internal open class KFunctionImpl protected constructor( name: String, signature: String, descriptorInitialValue: FunctionDescriptor? -) : KFunction, KCallableImpl, FunctionImpl(), - KLocalFunction, KMemberFunction, KTopLevelExtensionFunction, KTopLevelFunction { +) : KFunction, KCallableImpl, FunctionImpl() { constructor(container: KDeclarationContainerImpl, name: String, signature: String) : this(container, name, signature, null) constructor(container: KDeclarationContainerImpl, descriptor: FunctionDescriptor) : this( diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/FunctionReference.java b/core/runtime.jvm/src/kotlin/jvm/internal/FunctionReference.java index d4f2759f06c..3351044913c 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/FunctionReference.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/FunctionReference.java @@ -24,14 +24,7 @@ import java.lang.annotation.Annotation; import java.util.List; import java.util.Map; -@SuppressWarnings("deprecation") -public class FunctionReference - extends FunctionImpl - implements KFunction, - KTopLevelFunction, - KMemberFunction, - KTopLevelExtensionFunction, - KLocalFunction { +public class FunctionReference extends FunctionImpl implements KFunction { private final int arity; public FunctionReference(int arity) {