From d0db006614642724323ccba16a493cb449261491 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Thu, 23 May 2019 22:01:24 +0300
Subject: [PATCH] Build: Determine versions.properties location by
 buildscript.sourceURI

---
 gradle/versions.gradle.kts | 7 ++-----
 gradle/versions.properties | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gradle/versions.gradle.kts b/gradle/versions.gradle.kts
index 7de8cb4df95..108e8e0287d 100644
--- a/gradle/versions.gradle.kts
+++ b/gradle/versions.gradle.kts
@@ -1,11 +1,8 @@
 import java.util.*
 import java.io.*
 
-var propertiesFile: File = rootProject.file("gradle/versions.properties")
-if (!propertiesFile.exists()) {
-    //work-around for buildSrc
-    propertiesFile = rootProject.file("../gradle/versions.properties")
-}
+val scriptDirectory: File = File(buildscript.sourceURI!!.rawPath).parentFile
+val propertiesFile: File = File(scriptDirectory , "versions.properties")
 
 FileReader(propertiesFile).use {
     val properties = Properties()
diff --git a/gradle/versions.properties b/gradle/versions.properties
index cc2075076c7..28d373d2ac8 100644
--- a/gradle/versions.properties
+++ b/gradle/versions.properties
@@ -1,5 +1,6 @@
 versions.intellijSdk=191.6707.61
 versions.androidBuildTools=r23.0.1
+versions.androidDxSources=5.0.0_r2
 versions.idea.NodeJS=181.3494.12
 versions.jar.asm-all=7.0.1
 versions.jar.guava=25.1-jre