[Build] Make :compiler:test-different-jdk tests cacheable
diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts index 64936f6..69b2323 100644 --- a/compiler/tests-different-jdk/build.gradle.kts +++ b/compiler/tests-different-jdk/build.gradle.kts
@@ -1,6 +1,7 @@ plugins { kotlin("jvm") id("project-tests-convention") + id("test-inputs-check") } dependencies { @@ -53,7 +54,8 @@ taskName = "codegenTarget${targetInTestClass}Jvm${jvm}Test", jUnitMode = JUnitMode.JUnit5, maxMetaspaceSizeMb = 1024, - skipInLocalBuild = false + skipInLocalBuild = false, + defineJDKEnvVariables = listOf(jdk, JdkMajorVersion.JDK_11_0) ) { val testName = "JvmTarget${targetInTestClass}OnJvm${jvm}" filter.includeTestsMatching("org.jetbrains.kotlin.codegen.jdk.$testName")
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts index 878dfe7..c8f8af2 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts
@@ -319,7 +319,6 @@ ":compiler:multiplatform-parsing", ":compiler:psi:psi-api", ":compiler:test-infrastructure-utils", - ":compiler:tests-different-jdk", ":compiler:tests-integration", ":compose-compiler-gradle-plugin", ":examples:scripting-jvm-embeddable-host",
diff --git a/repo/gradle-build-conventions/project-tests-convention/src/main/kotlin/test-inputs-check.gradle.kts b/repo/gradle-build-conventions/project-tests-convention/src/main/kotlin/test-inputs-check.gradle.kts index 09b938e..51d9b08 100644 --- a/repo/gradle-build-conventions/project-tests-convention/src/main/kotlin/test-inputs-check.gradle.kts +++ b/repo/gradle-build-conventions/project-tests-convention/src/main/kotlin/test-inputs-check.gradle.kts
@@ -128,7 +128,8 @@ ) } else if (file.extension == "jar") { listOf( - """permission java.io.FilePermission "${file.absolutePath}", "read";""", + // JvmCompilationUtils.compileJavaFiles uses embedded javaCompiler if no jdkHome is set, and it opens dependencies + """permission java.io.FilePermission "${file.absolutePath}", "read,write";""", """permission java.io.FilePermission "${file.absolutePath}/-", "read";""", """permission java.io.FilePermission "${file.parentFile.absolutePath}", "read";""", )