diff --git a/samples/objc/build.gradle b/samples/objc/build.gradle index 465c5bda8d2..8c08eaa7527 100644 --- a/samples/objc/build.gradle +++ b/samples/objc/build.gradle @@ -1,14 +1,7 @@ apply plugin: 'konan' -konanInterop { - objective_c { - target "macbook" - } -} - konanArtifacts { Window { - useInterop 'objective_c' target "macbook" } } diff --git a/samples/objc/src/main/c_interop/objective_c.def b/samples/objc/src/main/c_interop/objective_c.def deleted file mode 100644 index c1c50548269..00000000000 --- a/samples/objc/src/main/c_interop/objective_c.def +++ /dev/null @@ -1,4 +0,0 @@ -headers = Foundation/Foundation.h Cocoa/Cocoa.h AppKit/NSApplication.h AppKit/NSWindow.h -headerFilter = Foundation/** Cocoa/** AppKit/** -language = Objective-C -linkerOpts = -framework AppKit diff --git a/samples/objc/src/main/kotlin/Window.kt b/samples/objc/src/main/kotlin/Window.kt index 111ed9bd0b8..097dc28ed89 100644 --- a/samples/objc/src/main/kotlin/Window.kt +++ b/samples/objc/src/main/kotlin/Window.kt @@ -1,7 +1,8 @@ +import kotlinx.cinterop.* +import platform.AppKit.* +import platform.Foundation.* import platform.objc.* import platform.osx.* -import objective_c.* -import kotlinx.cinterop.* fun main(args: Array) { autoreleasepool { diff --git a/samples/uikit/build.gradle b/samples/uikit/build.gradle index 3bd4bf3d125..682f4c77b38 100644 --- a/samples/uikit/build.gradle +++ b/samples/uikit/build.gradle @@ -1,15 +1,7 @@ apply plugin: 'konan' -konanInterop { - objc { - target "iphone" - } -} - - konanArtifacts { app { - useInterop 'objc' target "iphone" } } diff --git a/samples/uikit/src/main/c_interop/objc.def b/samples/uikit/src/main/c_interop/objc.def deleted file mode 100644 index 935666cb783..00000000000 --- a/samples/uikit/src/main/c_interop/objc.def +++ /dev/null @@ -1,4 +0,0 @@ -headers = Foundation/Foundation.h UIKit/UIKit.h -headerFilter = Foundation/** UIKit/** -language = Objective-C -linkerOpts = -framework Foundation -framework UIKit diff --git a/samples/uikit/src/main/kotlin/main.kt b/samples/uikit/src/main/kotlin/main.kt index 2e306e8abc6..11803196a60 100644 --- a/samples/uikit/src/main/kotlin/main.kt +++ b/samples/uikit/src/main/kotlin/main.kt @@ -1,5 +1,6 @@ -import objc.* import kotlinx.cinterop.* +import platform.Foundation.* +import platform.UIKit.* fun main(args: Array) { memScoped {