From 008a96191347fa9035a037a8b2d41f16b982ca57 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 24 Nov 2023 04:36:45 +0100 Subject: [PATCH] [kotlin-test] Add module-info compilations KT-61969 --- libraries/kotlin.test/build.gradle.kts | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libraries/kotlin.test/build.gradle.kts b/libraries/kotlin.test/build.gradle.kts index c687570287e..f99953d17f7 100644 --- a/libraries/kotlin.test/build.gradle.kts +++ b/libraries/kotlin.test/build.gradle.kts @@ -40,6 +40,14 @@ kotlin { } val main by getting val test by getting + configureJava9Compilation( + "kotlin.test", + listOf(main.output.allOutputs), + main.configurations.compileDependencyConfiguration, + project.sourceSets.create("jvmJava9") { + java.srcDir("jvm/src/java9/java") + }.name, + ) jvmTestFrameworks.forEach { framework -> val frameworkMain = create("$framework") { associateWith(main) @@ -47,6 +55,22 @@ kotlin { create("${framework}Test") { associateWith(frameworkMain) } + val frameworkJava9SourceSet = project.sourceSets.create("jvm${framework}Java9") { + java.srcDir("${framework.lowercase()}/src/java9/java") + } + configureJava9Compilation( + "kotlin.test.${framework.lowercase()}", + listOf(frameworkMain.output.allOutputs), + frameworkMain.configurations.compileDependencyConfiguration, + frameworkJava9SourceSet.name, + ) + val java9CompileOnly = configurations[frameworkJava9SourceSet.compileOnlyConfigurationName] + project.dependencies { + java9CompileOnly(project) + if (framework == JvmTestFramework.TestNG) { + java9CompileOnly("org.testng:testng:7.0.0") + } + } } test.associateWith(getByName("JUnit")) }