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

LV 2.0: fix test data in HierarchicalMppIT.testProjectDependencies

Browse Source 
This commit contains two kind of fixes:
1) K2 does not create entries for empty subpackages anymore,
so for the file with 'package foo.bar.baz' it creates an entry
only for the main package 'foo.bar.baz' and not for 'foo' or 'foo.bar'
2) K2 uses changed format of the classpath for third party common lib,
now it looks like other dependencies 'name-of-lib-<version>-commonMain'
instead of 'name-of-lib-metadata-<version>'
This commit is contained in:
Mikhail Glukhikh
2023-09-12 13:38:56 +02:00
committed by Space Team
parent 556f3ee8d5
commit 7c68e73816
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt
+9 -9
View File
@@ -420,13 +420,13 @@ open class HierarchicalMppIT : KGPBaseTest() {
"META-INF/$MULTIPLATFORM_PROJECT_METADATA_JSON_FILE_NAME",
"commonMain/default/manifest",
"commonMain/default/linkdata/package_com.example/",
"commonMain/default/linkdata/package_com.example.foo/",
"jvmAndJsMain/default/manifest",
"jvmAndJsMain/default/linkdata/package_com.example/",
"jvmAndJsMain/default/linkdata/package_com.example.foo/",
"linuxAndJsMain/default/manifest",
"linuxAndJsMain/default/linkdata/package_com.example/"
"linuxAndJsMain/default/linkdata/package_com.example.foo/"
)
val parsedProjectStructureMetadata: KotlinProjectStructureMetadata = publishedMetadataJar.getProjectStructureMetadata()
@@ -526,7 +526,7 @@ open class HierarchicalMppIT : KGPBaseTest() {
shouldNotInclude = listOf(
"my-lib-foo" to "jvmAndJsMain",
"my-lib-foo" to "linuxAndJsMain",
"third-party-lib-metadata-1.0" to ""
"third-party-lib-1.0" to "commonMain"
)
)
@@ -535,7 +535,7 @@ open class HierarchicalMppIT : KGPBaseTest() {
shouldInclude = listOf(
"my-lib-foo" to "main",
"my-lib-foo" to "jvmAndJsMain",
"third-party-lib-metadata-1.0" to ""
"third-party-lib-1.0" to "commonMain"
),
shouldNotInclude = listOf(
"my-lib-foo" to "linuxAndJsMain"
@@ -550,7 +550,7 @@ open class HierarchicalMppIT : KGPBaseTest() {
),
shouldNotInclude = listOf(
"my-lib-foo" to "jvmAndJsMain",
"third-party-lib-metadata-1.0" to ""
"third-party-lib-1.0" to "commonMain"
)
)
}
@@ -570,7 +570,7 @@ open class HierarchicalMppIT : KGPBaseTest() {
"my-lib-bar" to "linuxAndJsMain",
"my-lib-foo" to "jvmAndJsMain",
"my-lib-foo" to "linuxAndJsMain",
"third-party-lib-metadata-1.0" to ""
"third-party-lib-1.0" to "commonMain"
)
)
@@ -581,7 +581,7 @@ open class HierarchicalMppIT : KGPBaseTest() {
"my-lib-bar" to "jvmAndJsMain",
"my-lib-foo" to "main",
"my-lib-foo" to "jvmAndJsMain",
"third-party-lib-metadata-1.0" to ""
"third-party-lib-1.0" to "commonMain"
),
shouldNotInclude = listOf(
"my-lib-bar" to "linuxAndJsMain",
@@ -600,7 +600,7 @@ open class HierarchicalMppIT : KGPBaseTest() {
shouldNotInclude = listOf(
"my-lib-bar" to "jvmAndJsMain",
"my-lib-foo" to "jvmAndJsMain",
"third-party-lib-metadata-1.0" to ""
"third-party-lib-1.0" to "commonMain"
)
)