Fix rootDir mis-use in commonConfiguration.gradle:

replace with `kotlin_root`, that is set in the projects
This commit is contained in:
Sergey Igushkin
2017-05-04 20:13:37 +03:00
parent c3ae37c6ce
commit 7030b89b7c
3 changed files with 4 additions and 3 deletions
+1
View File
@@ -1,4 +1,5 @@
buildscript { buildscript {
ext.kotlin_root = "$rootDir/.."
apply from: 'versions.gradle' apply from: 'versions.gradle'
repositories { repositories {
+2 -2
View File
@@ -9,8 +9,8 @@ ext {
JDK_16 = jdkPath("1.6") JDK_16 = jdkPath("1.6")
JDK_17 = jdkPath("1.7") JDK_17 = jdkPath("1.7")
JDK_18 = jdkPath("1.8") JDK_18 = jdkPath("1.8")
distDir = file("${rootDir}/../dist") distDir = file("$kotlin_root/dist")
distLibDir = file("${rootDir}/../dist/kotlinc/lib") distLibDir = file("$kotlin_root/dist/kotlinc/lib")
bootstrapCompilerFile = file("$distDir/kotlin-compiler-for-maven.jar") bootstrapCompilerFile = file("$distDir/kotlin-compiler-for-maven.jar")
} }
+1 -1
View File
@@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_root = findProperty("kotlinRoot") ?: "${rootProject.projectDir}/../../.." ext.kotlin_root = "$rootDir/../../.."
apply from: "${kotlin_root}/libraries/versions.gradle" apply from: "${kotlin_root}/libraries/versions.gradle"
repositories { repositories {