From dc9a1ac76cbd547e076eec8842195ea620331dd5 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Fri, 13 Oct 2017 18:38:28 +0300
Subject: [PATCH] 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.

---
 samples/objc/build.gradle                                    | 5 ++---
 .../objc/src/main/c_interop/{objc.def => objective_c.def}    | 0
 samples/objc/src/main/kotlin/Window.kt                       | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename samples/objc/src/main/c_interop/{objc.def => objective_c.def} (100%)

diff --git a/samples/objc/build.gradle b/samples/objc/build.gradle
index d71a9558557..465c5bda8d2 100644
--- 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 b/samples/objc/src/main/c_interop/objective_c.def
similarity index 100%
rename from samples/objc/src/main/c_interop/objc.def
rename to samples/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
index b1e0e3eb09a..111ed9bd0b8 100644
--- 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>) {