Add kotlin runtime modulemap for swift export as part of kotlin-native dist #KT-65673 fixed

Co-authored-by: Alexander Shabalin <alexander.shabalin@ashabalin.me>

Merge-request: KT-MR-14493
Merged-by: Artem Olkov <artem.olkov@jetbrains.com>
This commit is contained in:
Artem Olkov
2024-02-26 12:51:57 +00:00
committed by Space Team
parent 28a305a826
commit dd9332d9e1
13 changed files with 110 additions and 36 deletions
@@ -7,10 +7,12 @@ package org.jetbrains.kotlin.konan.test.blackbox
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.konan.target.AppleConfigurables
import org.jetbrains.kotlin.konan.target.Distribution
import org.jetbrains.kotlin.konan.target.withOSVersion
import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.invokeSwiftC
import org.jetbrains.kotlin.konan.test.blackbox.support.settings.configurables
import org.jetbrains.kotlin.konan.test.blackbox.support.util.createModuleMap
import org.jetbrains.kotlin.utils.KotlinNativePaths
import org.jetbrains.kotlin.utils.fileUtils.withReplacedExtensionOrNull
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assumptions
@@ -55,10 +57,13 @@ abstract class SwiftTypeCheckBaseTest : AbstractNativeSimpleTest() {
val swiftTarget = configs.targetTriple.withOSVersion(configs.osVersionMin).toString()
val bridgeModuleFile = createModuleMap(buildDir, cHeader)
val kotlinRuntimeModuleMapFile = Distribution(KotlinNativePaths.homePath.absolutePath)
.kotlinRuntimeForSwiftModuleMap
val args = listOf(
"-typecheck", swiftFile.absolutePath,
"-Xcc", "-fmodule-map-file=${bridgeModuleFile.absolutePath}",
"-Xcc", "-fmodule-map-file=${kotlinRuntimeModuleMapFile}",
"-sdk", configs.absoluteTargetSysRoot, "-target", swiftTarget
)