[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:
@@ -3,8 +3,6 @@ plugins {
|
|||||||
id("jps-compatible")
|
id("jps-compatible")
|
||||||
}
|
}
|
||||||
|
|
||||||
project.configureJvmToolchain(JdkMajorVersion.JDK_11_0)
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation(kotlinStdlib())
|
testImplementation(kotlinStdlib())
|
||||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
|
|||||||
+2
-2
@@ -154,8 +154,8 @@ private class UnfilteredProcessOutput {
|
|||||||
private val stdErr = ByteArrayOutputStream()
|
private val stdErr = ByteArrayOutputStream()
|
||||||
|
|
||||||
fun toProcessOutput(outputFilter: TestOutputFilter): ProcessOutput = ProcessOutput(
|
fun toProcessOutput(outputFilter: TestOutputFilter): ProcessOutput = ProcessOutput(
|
||||||
stdOut = outputFilter.filter(stdOut.toString(Charsets.UTF_8)),
|
stdOut = outputFilter.filter(stdOut.toString(Charsets.UTF_8.name())),
|
||||||
stdErr = stdErr.toString(Charsets.UTF_8)
|
stdErr = stdErr.toString(Charsets.UTF_8.name())
|
||||||
)
|
)
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ plugins {
|
|||||||
id("jps-compatible")
|
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.
|
// 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
|
val nativeTargetName = HostManager.host.name
|
||||||
|
|
||||||
@@ -59,9 +57,6 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
if (!kotlinBuildProperties.isInIdeaSync) {
|
|
||||||
testImplementation(project(mapOf("path" to ":native:native.tests")))
|
|
||||||
}
|
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user