From e9fa576297e2095fd18107f3432c787c8f69b57c Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 17 May 2023 21:45:55 +0200 Subject: [PATCH] [Gradle] Fix expected JVM target version in compiler arguments test Since Gradle 8.0, the JDK used to run Gradle is exposed to plugins as a JVM toolchain, thus it configures the jvm target as it was a regular used-configured JVM toolchain https://docs.gradle.org/8.1/userguide/upgrading_version_7.html#toolchain_based_tasks_for_jvm_projects #KTI-1221 In Progress --- .../compilerArgumetns/KotlinCompileArgumentsTest.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinCompileArgumentsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinCompileArgumentsTest.kt index 98c1abbdea7..deeb4dbaae8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinCompileArgumentsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/compilerArgumetns/KotlinCompileArgumentsTest.kt @@ -7,19 +7,19 @@ package org.jetbrains.kotlin.gradle.unitTests.compilerArgumetns +import org.gradle.api.JavaVersion import org.gradle.kotlin.dsl.repositories import org.jetbrains.kotlin.cli.common.arguments.Argument import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments import org.jetbrains.kotlin.compilerRunner.ArgumentUtils -import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.gradle.dependencyResolutionTests.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.dsl.kotlinJvmExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.CreateCompilerArgumentsContext -import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ArgumentType.PluginClasspath import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.ArgumentType.Primitive import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext.Companion.lenient @@ -82,11 +82,11 @@ class KotlinCompileArgumentsTest { if (jvmTargetArgument !in argumentsString) fail("Missing '$jvmTargetArgument' in argument list") val indexOfJvmTargetArgument = argumentsString.indexOf(jvmTargetArgument) val jvmTargetTargetArgumentValue = argumentsString.getOrNull(indexOfJvmTargetArgument + 1) - assertEquals(JvmTarget.DEFAULT.description, jvmTargetTargetArgumentValue) + assertEquals(JvmTarget.fromTarget(JavaVersion.current().toString()).target, jvmTargetTargetArgumentValue) val parsedArguments = K2JVMCompilerArguments().apply { parseCommandLineArguments(argumentsString, this) } assertNotNull(parsedArguments.jvmTarget) - assertEquals(JvmTarget.DEFAULT.description, parsedArguments.jvmTarget) + assertEquals(JvmTarget.fromTarget(JavaVersion.current().toString()).target, parsedArguments.jvmTarget) }