Rewrite android sdk dependencies to avoid config-time tasks execution

This commit is contained in:
Ilya Chernikov
2017-12-01 17:08:54 +01:00
committed by Vyacheslav Gerasimov
parent febab82c7e
commit 46be5e25be
6 changed files with 63 additions and 39 deletions
+7 -1
View File
@@ -7,6 +7,8 @@ configureIntellijPlugin {
"java-decompiler", "java-i18n", "junit", "maven", "properties", "testng")
}
val androidSdk by configurations.creating
dependencies {
compileOnly(project(":kotlin-reflect-api"))
compile(project(":compiler:util"))
@@ -36,6 +38,7 @@ dependencies {
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk"))
}
afterEvaluate {
@@ -65,8 +68,11 @@ tasks.withType<KotlinCompile> {
}
projectTest {
dependsOn(androidSdk)
workingDir = rootDir
systemProperty("android.sdk", androidSdkPath())
doFirst {
systemProperty("android.sdk", androidSdk.singleFile.canonicalPath)
}
}
testsJar {}