[K/N]: Do not require JDK11 for :native:native.tests

This commit provides a small fix in the code of a native test runner so that JDK11 is not required and removes the JDK11 target for the atomicfu-compiler-plugin.

Fixes KT-61293

Merge-request: KT-MR-11757
Merged-by: Maria Sokolova <maria.sokolova@jetbrains.com>
This commit is contained in:
mvicsokolova
2023-08-22 13:32:38 +00:00
committed by Space Team
parent 7db551c452
commit 76a1091820
3 changed files with 2 additions and 9 deletions
-2
View File
@@ -3,8 +3,6 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_11_0)
dependencies {
testImplementation(kotlinStdlib())
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
@@ -154,8 +154,8 @@ private class UnfilteredProcessOutput {
private val stdErr = ByteArrayOutputStream()
fun toProcessOutput(outputFilter: TestOutputFilter): ProcessOutput = ProcessOutput(
stdOut = outputFilter.filter(stdOut.toString(Charsets.UTF_8)),
stdErr = stdErr.toString(Charsets.UTF_8)
stdOut = outputFilter.filter(stdOut.toString(Charsets.UTF_8.name())),
stdErr = stdErr.toString(Charsets.UTF_8.name())
)
companion object {
@@ -12,8 +12,6 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_11_0)
// WARNING: Native target is host-dependent. Re-running the same build on another host OS may bring to a different result.
val nativeTargetName = HostManager.host.name
@@ -59,9 +57,6 @@ repositories {
}
dependencies {
if (!kotlinBuildProperties.isInIdeaSync) {
testImplementation(project(mapOf("path" to ":native:native.tests")))
}
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))