diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterDescriptor.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterDescriptor.java index 5b6e140e250..9f4dfd3b9bd 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterDescriptor.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterDescriptor.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.load.java.sam; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.synthetic.FunctionInterfaceAdapterDescriptor; -import org.jetbrains.kotlin.descriptors.synthetic.SyntheticMemberDescriptor; import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; public interface SamAdapterDescriptor diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/samConversions.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/samConversions.kt index 6981bc1e831..3bb691075ac 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/samConversions.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/samConversions.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.psi2ir.generators import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.synthetic.FunctionInterfaceAdapterDescriptor import org.jetbrains.kotlin.descriptors.synthetic.FunctionInterfaceAdapterExtensionFunctionDescriptor import org.jetbrains.kotlin.descriptors.synthetic.FunctionInterfaceConstructorDescriptor diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt index c05f16effd0..9fd2491c945 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.scopes.utils import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.descriptors.synthetic.SyntheticMemberDescriptor import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name diff --git a/compiler/resolution/src/org/jetbrains/kotlin/descriptors/synthetic/SyntheticMemberDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/synthetic/SyntheticMemberDescriptor.kt similarity index 52% rename from compiler/resolution/src/org/jetbrains/kotlin/descriptors/synthetic/SyntheticMemberDescriptor.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/synthetic/SyntheticMemberDescriptor.kt index 38f3355c4f8..653f87bdb11 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/descriptors/synthetic/SyntheticMemberDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/synthetic/SyntheticMemberDescriptor.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 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. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.descriptors.synthetic