Renamed objc klib in the sample to objective_c to eliminate naming

conflict woth objc platform lib. Made objc sample compile with the platform libs.
JetBrains · Oct 13, 2017 · dc9a1ac · dc9a1ac
1 parent c4e45ba
commit dc9a1ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/samples/objc/build.gradle b/samples/objc/build.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'konan'
 
 konanInterop {
-    objc {
+    objective_c {
         target "macbook"
     }
 }
 
-
 konanArtifacts {
     Window {
-        useInterop 'objc'
+        useInterop 'objective_c'
         target "macbook"
     }
 }
diff --git a/samples/objc/src/main/c_interop/objc.def → ...s/objc/src/main/c_interop/objective_c.def b/samples/objc/src/main/c_interop/objc.def → ...s/objc/src/main/c_interop/objective_c.def
diff --git a/samples/objc/src/main/kotlin/Window.kt b/samples/objc/src/main/kotlin/Window.kt
@@ -1,4 +1,6 @@
-import objc.*
+import platform.objc.*
+import platform.osx.*
+import objective_c.*
 import kotlinx.cinterop.*
 
 fun main(args: Array<String>) {