From 7030b89b7c4e0b66d3c557ac5d68d320fc07533f Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Thu, 4 May 2017 20:13:37 +0300
Subject: [PATCH] Fix `rootDir` mis-use in `commonConfiguration.gradle`:
 replace with `kotlin_root`, that is set in the projects

---
 libraries/build.gradle                    | 1 +
 libraries/commonConfiguration.gradle      | 4 ++--
 libraries/tools/gradle-tools/build.gradle | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/build.gradle b/libraries/build.gradle
index 0de298b52a0..af877bc3a35 100644
--- a/libraries/build.gradle
+++ b/libraries/build.gradle
@@ -1,4 +1,5 @@
 buildscript {
+    ext.kotlin_root = "$rootDir/.."
     apply from: 'versions.gradle'
 
     repositories {
diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index b62e99ca72a..9d823e8f827 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -9,8 +9,8 @@ ext {
     JDK_16 = jdkPath("1.6")
     JDK_17 = jdkPath("1.7")
     JDK_18 = jdkPath("1.8")
-    distDir = file("${rootDir}/../dist")
-    distLibDir = file("${rootDir}/../dist/kotlinc/lib")
+    distDir = file("$kotlin_root/dist")
+    distLibDir = file("$kotlin_root/dist/kotlinc/lib")
     bootstrapCompilerFile = file("$distDir/kotlin-compiler-for-maven.jar")
 }
 
diff --git a/libraries/tools/gradle-tools/build.gradle b/libraries/tools/gradle-tools/build.gradle
index f1447b3649a..5fe8f08969a 100644
--- a/libraries/tools/gradle-tools/build.gradle
+++ b/libraries/tools/gradle-tools/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_root = findProperty("kotlinRoot") ?: "${rootProject.projectDir}/../../.."
+    ext.kotlin_root = "$rootDir/../../.."
     apply from: "${kotlin_root}/libraries/versions.gradle"
 
     repositories {