Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove custom NSErrorException in favor of built-in ObjCErrorException #666

Merged
merged 1 commit into from
Apr 19, 2024
Merged

Remove custom NSErrorException in favor of built-in ObjCErrorException #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions resources/src/appleMain/kotlin/dev/icerock/moko/resources/FontResource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import platform.Foundation.NSError
import platform.Foundation.NSString
import platform.Foundation.create
import platform.darwin.UInt8Var
import kotlin.native.internal.ObjCErrorException

actual class FontResource(
val fontName: String,
Expand Down Expand Up @@ -74,7 +75,7 @@ actual class FontResource(
}

@OptIn(ExperimentalForeignApi::class, UnsafeNumber::class)
@Throws(NSErrorException::class)
@Throws(ObjCErrorException::class)
@Suppress("unused")
fun registerFont() {
// CAST_NEVER_SUCCEEDS - String is final and isn't castable, but on iOS it's
Expand Down Expand Up @@ -109,7 +110,7 @@ actual class FontResource(
CFRelease(cfStringFilePath)

nsError?.let {
throw NSErrorException(it)
throw ObjCErrorException(it.localizedDescription, it)
}
}
}
37 changes: 0 additions & 37 deletions resources/src/appleMain/kotlin/dev/icerock/moko/resources/NSErrorException.kt
View file
Open in desktop

This file was deleted.

Loading