Use JDK 8 as JAVA_HOME for android tests
* android sdk tools binaries run in a child process relies on JAVA_HOME * old android sdk tools can run only under JDK 8, requiring javax libs
This commit is contained in:
committed by
Space Team
parent
b0d964ec8b
commit
0299d2c9e2
@@ -41,8 +41,10 @@ sourceSets {
|
||||
|
||||
projectTest {
|
||||
dependsOn(":dist")
|
||||
val jdkHome = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_1_8)
|
||||
doFirst {
|
||||
environment("kotlin.tests.android.timeout", "45")
|
||||
environment("JAVA_HOME", jdkHome.get())
|
||||
}
|
||||
|
||||
if (project.hasProperty("teamcity") || project.hasProperty("kotlin.test.android.teamcity")) {
|
||||
|
||||
Reference in New Issue
Block a user