From d100a079817f909fa748cd21f3ca28aa06e9371d Mon Sep 17 00:00:00 2001 From: Pavel Kunyavskiy Date: Thu, 18 Jan 2024 12:52:46 +0100 Subject: [PATCH] [K/N] Move ObjCOverridabilityCondition to proper module It was not active in diagnostic tests otherwise. --- ....jetbrains.kotlin.resolve.ExternalOverridabilityCondition | 1 - native/frontend/build.gradle.kts | 1 + ....jetbrains.kotlin.resolve.ExternalOverridabilityCondition | 1 + .../resolve/konan/platform}/ObjCOverridabilityCondition.kt | 5 ++++- 4 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 kotlin-native/backend.native/compiler/ir/backend.native/resources/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition create mode 100644 native/frontend/resources/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition rename {compiler/ir/ir.objcinterop/src/org/jetbrains/kotlin/ir/objcinterop => native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform}/ObjCOverridabilityCondition.kt (93%) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/resources/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition b/kotlin-native/backend.native/compiler/ir/backend.native/resources/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition deleted file mode 100644 index 7f0d039cb6e..00000000000 --- a/kotlin-native/backend.native/compiler/ir/backend.native/resources/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.ir.objcinterop.ObjCOverridabilityCondition diff --git a/native/frontend/build.gradle.kts b/native/frontend/build.gradle.kts index f4a2e8a2769..d055c69f2f1 100644 --- a/native/frontend/build.gradle.kts +++ b/native/frontend/build.gradle.kts @@ -7,6 +7,7 @@ dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.java")) compileOnly(project(":core:compiler.common.native")) + compileOnly(project(":compiler:ir.objcinterop")) compileOnly(intellijCore()) api(project(":native:kotlin-native-utils")) } diff --git a/native/frontend/resources/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition b/native/frontend/resources/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition new file mode 100644 index 00000000000..3e2a676f6bc --- /dev/null +++ b/native/frontend/resources/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition @@ -0,0 +1 @@ +org.jetbrains.kotlin.resolve.konan.platform.ObjCOverridabilityCondition diff --git a/compiler/ir/ir.objcinterop/src/org/jetbrains/kotlin/ir/objcinterop/ObjCOverridabilityCondition.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/ObjCOverridabilityCondition.kt similarity index 93% rename from compiler/ir/ir.objcinterop/src/org/jetbrains/kotlin/ir/objcinterop/ObjCOverridabilityCondition.kt rename to native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/ObjCOverridabilityCondition.kt index 4fcbef11769..019c27cf0e0 100644 --- a/compiler/ir/ir.objcinterop/src/org/jetbrains/kotlin/ir/objcinterop/ObjCOverridabilityCondition.kt +++ b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/ObjCOverridabilityCondition.kt @@ -3,11 +3,14 @@ * 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.ir.objcinterop +package org.jetbrains.kotlin.resolve.konan.platform import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.ir.objcinterop.getExternalObjCMethodInfo +import org.jetbrains.kotlin.ir.objcinterop.isExternalObjCClass import org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition /**