azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use JDK 8 as JAVA_HOME for android tests

Browse Source 
* 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:
Bogdan Mukvich
2023-04-25 11:24:12 +02:00
committed by Space Team
parent b0d964ec8b
commit 0299d2c9e2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/build.gradle.kts
+2
View File
@@ -41,8 +41,10 @@ sourceSets {
projectTest { projectTest {
dependsOn(":dist") dependsOn(":dist")
val jdkHome = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_1_8)
doFirst { doFirst {
environment("kotlin.tests.android.timeout", "45") environment("kotlin.tests.android.timeout", "45")
environment("JAVA_HOME", jdkHome.get())
} }
if (project.hasProperty("teamcity") || project.hasProperty("kotlin.test.android.teamcity")) { if (project.hasProperty("teamcity") || project.hasProperty("kotlin.test.android.teamcity")) {