Fixed base plugin configuration when targetJavaVersion is 1.8 (#108)

Author: Nikita-Smirnov-Exactpro

Diff for: plugin/src/functionalTest/kotlin/com/exactpro/th2/gradle/Th2BaseGradlePluginFunctionalTest.kt

@@ -93,7 +93,8 @@ class Th2BaseGradlePluginFunctionalTest {
         }
 
         val result =
-            GradleRunner.create()
+            GradleRunner
+                .create()
                 .forwardOutput()
                 .withDebug(true)
                 .withConfiguredVersion()
@@ -105,8 +106,7 @@ class Th2BaseGradlePluginFunctionalTest {
                     // because no git repository exist in test
                     "-x",
                     "generateGitProperties",
-                )
-                .build()
+                ).build()
 
         assertAll(
             { assertEquals(TaskOutcome.SUCCESS, result.task(":compileKotlin")?.outcome, "unexpected kotlin compile outcome") },
@@ -117,6 +117,79 @@ class Th2BaseGradlePluginFunctionalTest {
         )
     }
 
+    @Test
+    fun `the target jvm release version is 1 dot 8`() {
+        settingsFile.writeText(
+            """
+            rootProject.name = "test"
+            """.trimIndent(),
+        )
+        buildFile.writeText(
+            """
+            plugins {
+                id('java-library')
+                id('org.jetbrains.kotlin.jvm') version '1.9.0'
+                id('com.exactpro.th2.gradle.base')
+            }
+            
+            th2JavaRelease {
+              targetJavaVersion.set(JavaVersion.VERSION_1_8)
+            }
+            
+            repositories {
+                mavenCentral()
+            }
+            """.trimIndent(),
+        )
+        with(projectDir / "src" / "main" / "java") {
+            mkdirs()
+            resolve("Hello.java").writeText(
+                """
+                class Hello {
+                  public static void printHello() {
+                    System.out.println("Hello World from Java!");
+                  }
+                }
+                """.trimIndent(),
+            )
+        }
+        with(projectDir / "src" / "main" / "kotlin") {
+            mkdirs()
+            resolve("Main.kt").writeText(
+                """
+                fun main() {
+                  println("Hello World from Kotlin!")
+                  Hello.printHello()
+                }
+                """.trimIndent(),
+            )
+        }
+
+        val result =
+            GradleRunner
+                .create()
+                .forwardOutput()
+                .withDebug(true)
+                .withConfiguredVersion()
+                .withPluginClasspath()
+                .withProjectDir(projectDir)
+                .withArguments(
+                    "--stacktrace",
+                    "build",
+                    // because no git repository exist in test
+                    "-x",
+                    "generateGitProperties",
+                ).build()
+
+        assertAll(
+            { assertEquals(TaskOutcome.SUCCESS, result.task(":compileKotlin")?.outcome, "unexpected kotlin compile outcome") },
+            { assertEquals(TaskOutcome.SUCCESS, result.task(":compileJava")?.outcome, "unexpected java compile outcome") },
+            { assertEquals(TaskOutcome.SUCCESS, result.task(":build")?.outcome, "unexpected build outcome") },
+            { assertClassVersion("java", "Hello.class", 52) },
+            { assertClassVersion("kotlin", "MainKt.class", 52) },
+        )
+    }
+
     @Test
     fun `the default jvm release version is 11`() {
         settingsFile.writeText(
@@ -162,7 +235,8 @@ class Th2BaseGradlePluginFunctionalTest {
         }
 
         val result =
-            GradleRunner.create()
+            GradleRunner
+                .create()
                 .forwardOutput()
                 .withDebug(true)
                 .withConfiguredVersion()
@@ -174,8 +248,7 @@ class Th2BaseGradlePluginFunctionalTest {
                     // because no git repository exist in test
                     "-x",
                     "generateGitProperties",
-                )
-                .build()
+                ).build()
 
         assertAll(
             { assertEquals(TaskOutcome.SUCCESS, result.task(":compileKotlin")?.outcome, "unexpected kotlin compile outcome") },
@@ -213,7 +286,8 @@ class Th2BaseGradlePluginFunctionalTest {
         )
 
         val result =
-            GradleRunner.create()
+            GradleRunner
+                .create()
                 .forwardOutput()
                 .withDebug(true)
                 .withConfiguredVersion()
@@ -225,8 +299,7 @@ class Th2BaseGradlePluginFunctionalTest {
                     // because no git repository exist in test
                     "-x",
                     "generateGitProperties",
-                )
-                .build()
+                ).build()
         val checkLicenses = result.task(":checkLicense")
         assertNotNull(checkLicenses, "task checkLicense was not executed") {
             assertEquals(TaskOutcome.SUCCESS, it.outcome, "unexpected task result")
@@ -312,7 +385,8 @@ class Th2BaseGradlePluginFunctionalTest {
             """.trimIndent(),
         )
         val result =
-            GradleRunner.create()
+            GradleRunner
+                .create()
                 .forwardOutput()
                 .withDebug(true)
                 .withConfiguredVersion()
@@ -324,8 +398,7 @@ class Th2BaseGradlePluginFunctionalTest {
                     // because no git repository exist in test
                     "-x",
                     "generateGitProperties",
-                )
-                .build()
+                ).build()
 
         val checkLicenses = result.task(":checkLicense")
         assertNotNull(checkLicenses, "task checkLicense was not executed") {
@@ -371,7 +444,8 @@ class Th2BaseGradlePluginFunctionalTest {
         extraAssertion: (ArrayNode, String) -> Unit = { _, _ -> },
     ) {
         val module =
-            elements().asSequence()
+            elements()
+                .asSequence()
                 .find { it.get("moduleName").textValue() == moduleName }
         assertNotNull(module, "module $moduleName not found") { m ->
             val moduleInfo = assertIs<ObjectNode>(m, "module info must be an object")

Diff for: plugin/src/main/kotlin/com/exactpro/th2/gradle/BaseTh2Plugin.kt

@@ -30,7 +30,6 @@ import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.JavaTestFixturesPlugin
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.jvm.tasks.Jar
-import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.withType
@@ -159,7 +158,7 @@ class BaseTh2Plugin : Plugin<Project> {
         tasks.withType<JavaCompile> {
             options.release.set(
                 javaRelease.targetJavaVersion
-                    .map { JavaLanguageVersion.of(it.toString()).asInt() },
+                    .map { JavaVersion.toVersion(it).majorVersion.toInt() },
             )
         }
     }
@@ -185,14 +184,12 @@ class BaseTh2Plugin : Plugin<Project> {
 
     private fun Project.configureKotlinProject(extension: JavaReleaseTh2Extension) {
         plugins.withId("org.jetbrains.kotlin.jvm") {
-            fun JavaVersion.toJdkTarget() = if (ordinal <= JavaVersion.VERSION_1_8.ordinal) "1.$this" else this.toString()
-
             tasks.withType<KotlinCompile>().configureEach {
                 compilerOptions {
-                    jvmTarget.set(extension.targetJavaVersion.map { JvmTarget.fromTarget(it.toJdkTarget()) })
+                    jvmTarget.set(extension.targetJavaVersion.map { JvmTarget.fromTarget(it.toString()) })
                     freeCompilerArgs.add(
                         extension.targetJavaVersion
-                            .map { "-Xjdk-release=${it.toJdkTarget()}" },
+                            .map { "-Xjdk-release=$it" },
                     )
                 }
             }