[Gradle, JS] Fix associated compilations test and adopt to js ir
This commit is contained in:
+23
-2
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle
|
|||||||
import org.gradle.api.logging.LogLevel
|
import org.gradle.api.logging.LogLevel
|
||||||
import org.jdom.input.SAXBuilder
|
import org.jdom.input.SAXBuilder
|
||||||
import org.jetbrains.kotlin.gradle.internals.*
|
import org.jetbrains.kotlin.gradle.internals.*
|
||||||
|
import org.jetbrains.kotlin.gradle.plugin.JsMode
|
||||||
import org.jetbrains.kotlin.gradle.plugin.ProjectLocalConfigurations
|
import org.jetbrains.kotlin.gradle.plugin.ProjectLocalConfigurations
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmWithJavaTargetPreset
|
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmWithJavaTargetPreset
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin
|
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin
|
||||||
@@ -2220,9 +2221,22 @@ class NewMultiplatformIT : BaseGradleIT() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testAssociateCompilations() = with(Project("new-mpp-associate-compilations", GradleVersionRequired.AtLeast("5.0"))) {
|
fun testAssociateCompilations() {
|
||||||
|
testAssociateCompilationsImpl(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testAssociateCompilationsWithJsIr() {
|
||||||
|
testAssociateCompilationsImpl(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun testAssociateCompilationsImpl(jsIr: Boolean) {
|
||||||
|
with(Project("new-mpp-associate-compilations", GradleVersionRequired.AtLeast("5.0"))) {
|
||||||
setupWorkingDir()
|
setupWorkingDir()
|
||||||
gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl)
|
gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl)
|
||||||
|
if (!jsIr) {
|
||||||
|
gradleProperties().appendText(jsMode(JsMode.LEGACY))
|
||||||
|
}
|
||||||
|
|
||||||
val tasks = listOf("jvm", "js", nativeHostTargetName).map { ":compileIntegrationTestKotlin${it.capitalize()}" }
|
val tasks = listOf("jvm", "js", nativeHostTargetName).map { ":compileIntegrationTestKotlin${it.capitalize()}" }
|
||||||
|
|
||||||
@@ -2239,7 +2253,13 @@ class NewMultiplatformIT : BaseGradleIT() {
|
|||||||
assertFileExists("build/classes/kotlin/jvm/integrationTest/META-INF/new-mpp-associate-compilations.kotlin_module")
|
assertFileExists("build/classes/kotlin/jvm/integrationTest/META-INF/new-mpp-associate-compilations.kotlin_module")
|
||||||
|
|
||||||
// JS:
|
// JS:
|
||||||
assertFileExists("build/classes/kotlin/js/integrationTest/new-mpp-associate-compilations_integrationTest.js")
|
assertFileExists(
|
||||||
|
if (jsIr) {
|
||||||
|
"build/classes/kotlin/js/integrationTest/manifest"
|
||||||
|
} else {
|
||||||
|
"build/classes/kotlin/js/integrationTest/new-mpp-associate-compilations_integrationTest.js"
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
// Native:
|
// Native:
|
||||||
assertFileExists("build/classes/kotlin/$nativeHostTargetName/integrationTest/new-mpp-associate-compilations_integrationTest.klib")
|
assertFileExists("build/classes/kotlin/$nativeHostTargetName/integrationTest/new-mpp-associate-compilations_integrationTest.klib")
|
||||||
@@ -2253,6 +2273,7 @@ class NewMultiplatformIT : BaseGradleIT() {
|
|||||||
assertContains(UnsatisfiedSourceSetVisibilityException::class.java.simpleName)
|
assertContains(UnsatisfiedSourceSetVisibilityException::class.java.simpleName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testTestRunsApi() = with(Project("new-mpp-associate-compilations", GradleVersionRequired.AtLeast("5.0"))) {
|
fun testTestRunsApi() = with(Project("new-mpp-associate-compilations", GradleVersionRequired.AtLeast("5.0"))) {
|
||||||
|
|||||||
Reference in New Issue
Block a user