From 89d6c24f566a0ee62801b15526c4ae7ceb09f467 Mon Sep 17 00:00:00 2001
From: Vasily Levchenko <vasily.v.levchenko@gmail.com>
Date: Wed, 28 Sep 2016 16:08:44 +0300
Subject: [PATCH] HEAD UP! The gradle.property contains the version of the
 kotlin kotlin_version, previously it was used for holding llvmInstallPath,
 now this variable should be defined in local.property

---
 .gitignore                         | 1 +
 Interop/Indexer/build.gradle       | 2 --
 Interop/Runtime/build.gradle       | 2 --
 Interop/StubGenerator/build.gradle | 2 --
 build.gradle                       | 6 +++++-
 settings.gradle                    | 1 -
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f8dbf78980..f80f5ac3195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ tmp
 workspace.xml
 *.versionsBackup
 
+local.properties
 .gradle
 build
 translator/.gradle/2.9/taskArtifacts
diff --git a/Interop/Indexer/build.gradle b/Interop/Indexer/build.gradle
index 7e84515c70f..6b47cbb0029 100644
--- a/Interop/Indexer/build.gradle
+++ b/Interop/Indexer/build.gradle
@@ -1,6 +1,4 @@
 buildscript {
-   ext.kotlin_version = '1.0.3'
-
    repositories {
      mavenCentral()
    }
diff --git a/Interop/Runtime/build.gradle b/Interop/Runtime/build.gradle
index e32dec48ca8..322cf9e4d63 100644
--- a/Interop/Runtime/build.gradle
+++ b/Interop/Runtime/build.gradle
@@ -1,6 +1,4 @@
 buildscript {
-   ext.kotlin_version = '1.0.3'
-
    repositories {
      mavenCentral()
    }
diff --git a/Interop/StubGenerator/build.gradle b/Interop/StubGenerator/build.gradle
index a1cd2c0abdf..bb0f5d74bdb 100644
--- a/Interop/StubGenerator/build.gradle
+++ b/Interop/StubGenerator/build.gradle
@@ -1,6 +1,4 @@
 buildscript {
-   ext.kotlin_version = '1.0.3'
-
    repositories {
      mavenCentral()
    }
diff --git a/build.gradle b/build.gradle
index 9769743dc45..a3b77570ab2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1 +1,5 @@
-ant.importBuild 'kotlin-ir/build.xml'
+ant.importBuild 'backend.native/kotlin-ir/build.xml'
+
+Properties props = new Properties()
+props.load(new FileInputStream("$project.rootDir/local.properties"))
+props.each {prop -> project.ext.set(prop.key, prop.value)}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index eb3ec64caa7..f904ffb1584 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,4 +3,3 @@ include ':Interop:StubGenerator'
 include ':Interop:Runtime'
 include ':InteropExample'
 include ':backend.native'
-include ':backend.native:cli.bc'