azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle][MPP] Fix KotlinProjectStructureMetadataSerializationTest.sampleMetadata

Browse Source 
This object did not list 'commonMain' and put non-idiomatic
data into 'sourceSetNamesByVariantName'

^KT-48135 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-09-21 12:13:46 +02:00
committed by Space
parent 59d0bd5e39
commit 386c2f8015
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinProjectStructureMetadataSerializationTest.kt
+5 -2
View File
@@ -20,15 +20,18 @@ class KotlinProjectStructureMetadataSerializationTest {
private val sampleMetadata = KotlinProjectStructureMetadata( private val sampleMetadata = KotlinProjectStructureMetadata(
sourceSetNamesByVariantName = mapOf( sourceSetNamesByVariantName = mapOf(
"sourceSetA" to setOf("value1", "value2"), "sourceSetB" to setOf("value3", "value4"), "sourceSetC" to setOf("value5") "variant1" to setOf("commonMain", "sourceSetA", "sourceSetB"),
"variant2" to setOf("commonMain", "sourceSetC")
), ),
sourceSetsDependsOnRelation = mapOf( sourceSetsDependsOnRelation = mapOf(
"commonMain" to emptySet(),
"sourceSetA" to setOf("commonMain"), "sourceSetA" to setOf("commonMain"),
"sourceSetB" to setOf("commonMain", "sourceSetA"), "sourceSetB" to setOf("commonMain", "sourceSetA"),
"sourceSetC" to setOf("commonMain", "sourceSetB") "sourceSetC" to setOf("commonMain", "sourceSetB")
), ),
sourceSetBinaryLayout = mapOf("sourceSetA" to METADATA, "sourceSetB" to KLIB, "sourceSetC" to KLIB), sourceSetBinaryLayout = mapOf("sourceSetA" to METADATA, "sourceSetB" to KLIB, "sourceSetC" to KLIB),
sourceSetModuleDependencies = mapOf( sourceSetModuleDependencies = mapOf(
"commonMain" to emptySet(),
"sourceSetA" to setOf(ModuleDependencyIdentifier("aa", "bb")), "sourceSetA" to setOf(ModuleDependencyIdentifier("aa", "bb")),
"sourceSetB" to setOf(ModuleDependencyIdentifier("cc", "dd"), ModuleDependencyIdentifier("ee", "ff")), "sourceSetB" to setOf(ModuleDependencyIdentifier("cc", "dd"), ModuleDependencyIdentifier("ee", "ff")),
"sourceSetC" to emptySet() "sourceSetC" to emptySet()
@@ -36,7 +39,7 @@ class KotlinProjectStructureMetadataSerializationTest {
sourceSetCInteropMetadataDirectory = mapOf("sourceSetB" to "xx/cinterop/", "sourceSetC" to "cinterops/C"), sourceSetCInteropMetadataDirectory = mapOf("sourceSetB" to "xx/cinterop/", "sourceSetC" to "cinterops/C"),
hostSpecificSourceSets = setOf("sourceSetC"), hostSpecificSourceSets = setOf("sourceSetC"),
isPublishedAsRoot = true, isPublishedAsRoot = true,
sourceSetNames = setOf("sourceSetA", "sourceSetB", "sourceSetC"), sourceSetNames = setOf("commonMain", "sourceSetA", "sourceSetB", "sourceSetC"),
) )
@Test @Test