Rewrite android sdk dependencies to avoid config-time tasks execution
This commit is contained in:
committed by
Vyacheslav Gerasimov
parent
febab82c7e
commit
46be5e25be
@@ -10,6 +10,8 @@ configureIntellijPlugin {
|
||||
"java-decompiler", "java-i18n", "junit", "maven", "properties", "testng")
|
||||
}
|
||||
|
||||
val androidSdk by configurations.creating
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:light-classes"))
|
||||
@@ -36,6 +38,7 @@ dependencies {
|
||||
testRuntime(project(":noarg-ide-plugin"))
|
||||
testRuntime(project(":allopen-ide-plugin"))
|
||||
testRuntime(project(":plugins:lint"))
|
||||
androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk"))
|
||||
}
|
||||
|
||||
afterEvaluate {
|
||||
@@ -61,8 +64,11 @@ testsJar {}
|
||||
|
||||
projectTest {
|
||||
dependsOn(":kotlin-android-extensions-runtime:dist")
|
||||
dependsOn(androidSdk)
|
||||
workingDir = rootDir
|
||||
systemProperty("android.sdk", androidSdkPath())
|
||||
doFirst {
|
||||
systemProperty("android.sdk", androidSdk.singleFile.canonicalPath)
|
||||
}
|
||||
}
|
||||
|
||||
runtimeJar()
|
||||
|
||||
Reference in New Issue
Block a user