[K/N] K2/MPP: Move stdlib to the head of dependency list.
^KT-61645 Fixed Merge-request: KT-MR-12079 Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
This commit is contained in:
committed by
Space Team
parent
fbeed67931
commit
c4201101ac
+9
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet
|
||||
import org.jetbrains.kotlin.gradle.testbase.*
|
||||
import org.jetbrains.kotlin.gradle.util.checkedReplace
|
||||
import org.jetbrains.kotlin.gradle.util.modify
|
||||
import org.junit.jupiter.api.Disabled
|
||||
import org.junit.jupiter.api.DisplayName
|
||||
import org.junit.jupiter.api.condition.OS
|
||||
import org.junit.jupiter.api.io.TempDir
|
||||
@@ -1238,6 +1239,14 @@ open class HierarchicalMppIT : KGPBaseTest() {
|
||||
}
|
||||
}
|
||||
|
||||
@Disabled("Disabled until kotlin-native fix from MR https://jetbrains.team/p/kt/reviews/12079/timeline is deployed and can be tested")
|
||||
@GradleTest
|
||||
@DisplayName("K2: Check native stdlib is not shadowed by commonMain metadata")
|
||||
fun testK2NativeStdlibConflict(gradleVersion: GradleVersion) {
|
||||
nativeProject("kt61430", gradleVersion, buildOptions = defaultBuildOptions.copyEnsuringK2()) {
|
||||
build("assemble")
|
||||
}
|
||||
}
|
||||
|
||||
private fun TestProject.testDependencyTransformations(
|
||||
subproject: String? = null,
|
||||
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
plugins {
|
||||
kotlin("multiplatform")
|
||||
}
|
||||
|
||||
group = "org.jetbrains.qa"
|
||||
version = "1.0-SNAPSHOT"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
}
|
||||
|
||||
kotlin {
|
||||
linuxX64()
|
||||
mingwX64() // can be any dummy target here, just for sake of nativeMain auto-insertion
|
||||
}
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
import kotlin.reflect.KMutableProperty1
|
||||
import kotlin.reflect.KType
|
||||
|
||||
public fun <K : Any?, V : Any?> returnTypeLinux(field: KMutableProperty1<K, V>): KType {
|
||||
return field.returnType
|
||||
}
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
import kotlin.reflect.KMutableProperty1
|
||||
import kotlin.reflect.KType
|
||||
|
||||
fun <K : Any?, V : Any?> returnTypeShared(field: KMutableProperty1<K, V>): KType {
|
||||
return field.returnType
|
||||
}
|
||||
Reference in New Issue
Block a user