diff --git a/build.gradle.kts b/build.gradle.kts index d25b68fabca..5030969ddbd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -412,7 +412,6 @@ val projectsWithOptInToUnsafeCastFunctionsFromAddToStdLib by extra { ":kotlin-gradle-plugin", ":kotlin-reflect-api", ":kotlin-scripting-jvm-host-test", - ":native:frontend.native", ":native:kotlin-klib-commonizer", ":plugins:android-extensions-compiler", ":plugins:jvm-abi-gen", diff --git a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeObjCNameChecker.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeObjCNameChecker.kt index 2b677c4dbe9..0c6eb97aa49 100644 --- a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeObjCNameChecker.kt +++ b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativeObjCNameChecker.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.annotations.argumentValue import org.jetbrains.kotlin.resolve.checkers.DeclarationChecker import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext -import org.jetbrains.kotlin.utils.addToStdlib.safeAs object NativeObjCNameChecker : DeclarationChecker { @@ -90,9 +89,9 @@ object NativeObjCNameChecker : DeclarationChecker { class ObjCName( val annotation: AnnotationDescriptor ) { - val name: String? = annotation.argumentValue("name")?.value?.safeAs() - val swiftName: String? = annotation.argumentValue("swiftName")?.value?.safeAs() - val exact: Boolean = annotation.argumentValue("exact")?.value?.safeAs() ?: false + val name: String? = annotation.argumentValue("name")?.value as? String + val swiftName: String? = annotation.argumentValue("swiftName")?.value as? String + val exact: Boolean = annotation.argumentValue("exact")?.value as? Boolean ?: false override fun equals(other: Any?): Boolean = other is ObjCName && name == other.name && swiftName == other.swiftName && exact == other.exact