From 6ef3831f14edf54454549df2e680a207bfc850b3 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Mon, 2 Dec 2019 21:13:28 +0300
Subject: [PATCH] Build: Take parent directory as rootProject directory in case
 of buildSrc

---
 buildSrc/settings.gradle                          |  2 +-
 .../kotlin-build-gradle-plugin/build.gradle.kts   |  2 +-
 .../src/BuildProperties.kt                        | 15 ++++++++-------
 settings.gradle                                   |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index eada2b3a41a..6bb99fb0582 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -20,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.2")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.3")
     }
 }
 
diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
index de15974fba9..5b4af9bab3a 100644
--- a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
+++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "org.jetbrains.kotlin"
-version = "0.0.2"
+version = "0.0.3"
 
 repositories {
     mavenCentral()
diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
index 173854504f0..764ea8cb977 100644
--- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
+++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
@@ -1,14 +1,15 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+@file:Suppress("unused", "MemberVisibilityCanBePrivate")
+
 import org.gradle.api.Project
 import org.gradle.api.initialization.Settings
 import org.gradle.api.internal.DynamicObjectAware
 import java.io.File
 import java.util.*
 
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
 interface PropertiesProvider {
     val rootProjectDir: File
     fun getProperty(key: String): Any?
@@ -93,7 +94,7 @@ private const val extensionName = "kotlinBuildProperties"
 
 class ProjectProperties(val project: Project) : PropertiesProvider {
     override val rootProjectDir: File
-        get() = project.projectDir
+        get() = project.rootProject.projectDir.let { if (it.name == "buildSrc") it.parentFile else it }
 
     override fun getProperty(key: String): Any? = project.findProperty(key)
 }
@@ -106,7 +107,7 @@ val Project.kotlinBuildProperties: KotlinBuildProperties
 
 class SettingsProperties(val settings: Settings) : PropertiesProvider {
     override val rootProjectDir: File
-        get() = settings.rootDir
+        get() = settings.rootDir.let { if (it.name == "buildSrc") it.parentFile else it }
 
     override fun getProperty(key: String): Any? {
         val obj = (settings as DynamicObjectAware).asDynamicObject
diff --git a/settings.gradle b/settings.gradle
index a1428f7a57c..9394864e32d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,7 +31,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.2")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.3")
     }
 }