Skip to content

Commit b65cba6

Browse files
timofey-soloninSpace Team
timofey-solonin
authored and
Space Team
committed
Handle pre-HMPP publications in lenient resolution
^KT-81412
1 parent 0cf9a6b commit b65cba6

File tree

5 files changed

+178
-10
lines changed

5 files changed

+178
-10
lines changed

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/uklibs/KmpResolutionIT.kt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,11 @@ class KmpResolutionIT : KGPBaseTest() {
547547
"org.jetbrains.kotlin:kotlin-dom-api-compat:${defaultBuildOptions.kotlinVersion}" to ResolvedComponentWithArtifacts(
548548
artifacts = mutableListOf(
549549
),
550-
configuration = "commonFakeApiElements-published",
550+
configuration = if (version < GradleVersion.version("8.0")) {
551+
"commonFakeApiElements-published"
552+
} else {
553+
"fallbackVariant_KT-81412"
554+
},
551555
),
552556
"org.jetbrains.kotlin:kotlin-stdlib:${defaultBuildOptions.kotlinVersion}" to ResolvedComponentWithArtifacts(
553557
artifacts = mutableListOf(
@@ -766,7 +770,11 @@ class KmpResolutionIT : KGPBaseTest() {
766770
"org.jetbrains.kotlin:kotlin-dom-api-compat:${defaultBuildOptions.kotlinVersion}" to ResolvedComponentWithArtifacts(
767771
artifacts = mutableListOf(
768772
),
769-
configuration = "commonFakeApiElements-published",
773+
configuration = if (version < GradleVersion.version("8.0")) {
774+
"commonFakeApiElements-published"
775+
} else {
776+
"fallbackVariant_KT-81412"
777+
},
770778
),
771779
"org.jetbrains.kotlin:kotlin-stdlib:${defaultBuildOptions.kotlinVersion}" to ResolvedComponentWithArtifacts(
772780
artifacts = mutableListOf(

‎libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/uklibs/UklibInterprojectConsumptionIT.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,11 @@ class UklibInterprojectConsumptionIT : KGPBaseTest() {
197197
"org.jetbrains.kotlin:kotlin-dom-api-compat:${defaultBuildOptions.kotlinVersion}" to ResolvedComponentWithArtifacts(
198198
artifacts = mutableListOf(
199199
),
200-
configuration = "commonFakeApiElements-published",
200+
configuration = if (gradleVersion < GradleVersion.version("8.0")) {
201+
"commonFakeApiElements-published"
202+
} else {
203+
"fallbackVariant_KT-81412"
204+
},
201205
),
202206
"org.jetbrains.kotlin:kotlin-stdlib:${defaultBuildOptions.kotlinVersion}" to ResolvedComponentWithArtifacts(
203207
artifacts = mutableListOf(

‎libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/uklibs/consumption/UklibConsumptionSetupAction.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ internal class SelectBestMatchingVariantForKmpResolutionUsage : AttributeDisambi
441441
*
442442
* To make sure our rule is in control, we can try to reshuffle rules in [setAttributeDisambiguationPrecedence]
443443
*/
444-
val apiElements = listOf(
444+
val nonJvmApiElements = listOf(
445445
KOTLIN_UKLIB_API,
446446
/**
447447
* Prefer platform apiElements if it is available when consuming standard KMP publication for compilation
@@ -450,6 +450,9 @@ internal class SelectBestMatchingVariantForKmpResolutionUsage : AttributeDisambi
450450
*/
451451
KOTLIN_API,
452452
)
453+
val jvmApiElements = listOf(
454+
KOTLIN_UKLIB_API,
455+
)
453456
val runtimeElements = listOf(
454457
/**
455458
* Prefer UKlib runtime
@@ -461,8 +464,8 @@ internal class SelectBestMatchingVariantForKmpResolutionUsage : AttributeDisambi
461464
KOTLIN_RUNTIME,
462465
)
463466
mapOf(
464-
KOTLIN_UKLIB_JAVA_API to apiElements,
465-
KOTLIN_UKLIB_API to apiElements,
467+
KOTLIN_UKLIB_JAVA_API to jvmApiElements,
468+
KOTLIN_UKLIB_API to nonJvmApiElements,
466469
KOTLIN_UKLIB_JAVA_RUNTIME to runtimeElements,
467470
KOTLIN_UKLIB_RUNTIME to runtimeElements,
468471
KOTLIN_UKLIB_METADATA to listOf(

‎libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/uklibs/ResolutionTestingAttributes.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ val uklibTransformationWasmWasiAttributes = mapOf(
4040
"org.jetbrains.kotlin.uklibState" to "decompressed",
4141
)
4242

43+
val preHmppKmpAttributes = mapOf(
44+
"org.gradle.category" to "library",
45+
"org.gradle.usage" to "kotlin-api",
46+
"org.jetbrains.kotlin.platform.type" to "common"
47+
)
48+
4349
val jvmRuntimeAttributes = mapOf(
4450
"org.gradle.category" to "library",
4551
"org.gradle.libraryelements" to "jar",
@@ -157,4 +163,7 @@ val uklibArtifact = mapOf(
157163
)
158164
val klibCinteropCommonizerType = mapOf(
159165
"org.jetbrains.kotlin.cinteropCommonizerArtifactType" to "klib",
166+
)
167+
val orgJetbrainsKotlinKlibArtifactType = mapOf(
168+
"artifactType" to "org.jetbrains.kotlin.klib"
160169
)

‎libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/uklibs/UklibResolutionWithMockComponents.kt‎

Lines changed: 148 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,8 @@ class UklibResolutionTestsWithMockComponents {
517517
}
518518

519519
listOf(
520-
consumer.multiplatformExtension.iosArm64().compilationResolution(),
521-
consumer.multiplatformExtension.jvm().compilationResolution(),
522-
consumer.multiplatformExtension.wasmJs().compilationResolution(),
520+
consumer.multiplatformExtension.iosArm64(),
521+
consumer.multiplatformExtension.wasmJs(),
523522
).forEach {
524523
assertEquals(
525524
mapOf<String, ResolvedComponentWithArtifacts>(
@@ -528,11 +527,13 @@ class UklibResolutionTestsWithMockComponents {
528527
artifacts = mutableListOf()
529528
),
530529
).prettyPrinted,
531-
it.prettyPrinted,
530+
it.compilationResolution().prettyPrinted,
531+
message = it.name,
532532
)
533533
}
534534

535535
listOf(
536+
consumer.multiplatformExtension.jvm().compilationResolution(),
536537
consumer.multiplatformExtension.jvm().runtimeResolution(),
537538
consumer.multiplatformExtension.wasmJs().runtimeResolution(),
538539
).forEach {
@@ -844,6 +845,149 @@ class UklibResolutionTestsWithMockComponents {
844845
}
845846
}
846847

848+
@Test
849+
fun `uklib resolution - resolution with legacy KMP`() {
850+
val consumer = uklibConsumer {
851+
repositories.mavenCentral()
852+
kotlin {
853+
iosArm64()
854+
iosX64()
855+
jvm()
856+
js()
857+
wasmWasi()
858+
sourceSets.commonMain.dependencies {
859+
implementation("net.mamoe.yamlkt:yamlkt:0.13.0").apply {
860+
(this as ModuleDependency).isTransitive = false
861+
}
862+
}
863+
}
864+
}
865+
866+
assertEquals(
867+
mapOf<String, ResolvedComponentWithArtifacts>(
868+
"net.mamoe.yamlkt:yamlkt-jvm:0.13.0" to ResolvedComponentWithArtifacts(
869+
artifacts = mutableListOf(
870+
(kmpJvmApiVariantAttributes + jarArtifact) - "org.gradle.jvm.environment",
871+
),
872+
configuration = "jvmApiElements-published",
873+
),
874+
"net.mamoe.yamlkt:yamlkt:0.13.0" to ResolvedComponentWithArtifacts(
875+
artifacts = mutableListOf(
876+
),
877+
configuration = "jvmApiElements-published",
878+
),
879+
).prettyPrinted,
880+
consumer.multiplatformExtension.jvm().compilationResolution().prettyPrinted
881+
)
882+
883+
assertEquals(
884+
mapOf<String, ResolvedComponentWithArtifacts>(
885+
"net.mamoe.yamlkt:yamlkt-jvm:0.13.0" to ResolvedComponentWithArtifacts(
886+
artifacts = mutableListOf(
887+
(kmpJvmRuntimeVariantAttributes + jarArtifact) - "org.gradle.jvm.environment",
888+
),
889+
configuration = "jvmRuntimeElements-published",
890+
),
891+
"net.mamoe.yamlkt:yamlkt:0.13.0" to ResolvedComponentWithArtifacts(
892+
artifacts = mutableListOf(
893+
),
894+
configuration = "jvmRuntimeElements-published",
895+
),
896+
).prettyPrinted,
897+
consumer.multiplatformExtension.jvm().runtimeResolution().prettyPrinted
898+
)
899+
900+
listOf(
901+
consumer.multiplatformExtension.sourceSets.iosMain.get().internal.resolvableMetadataConfiguration.resolveProjectDependencyComponentsWithArtifacts(),
902+
consumer.multiplatformExtension.sourceSets.commonMain.get().internal.resolvableMetadataConfiguration.resolveProjectDependencyComponentsWithArtifacts(),
903+
).forEach {
904+
assertEquals(
905+
mapOf<String, ResolvedComponentWithArtifacts>(
906+
"net.mamoe.yamlkt:yamlkt:0.13.0" to ResolvedComponentWithArtifacts(
907+
configuration = "metadataApiElements",
908+
artifacts = mutableListOf(
909+
(kmpMetadataVariantAttributes + jarArtifact + libraryElementsJar) - "org.gradle.jvm.environment",
910+
)
911+
)
912+
).prettyPrinted,
913+
it.prettyPrinted,
914+
)
915+
}
916+
917+
assertEquals(
918+
mapOf<String, ResolvedComponentWithArtifacts>(
919+
"net.mamoe.yamlkt:yamlkt-iosarm64:0.13.0" to ResolvedComponentWithArtifacts(
920+
artifacts = mutableListOf(
921+
(kmpIosArm64KlibVariant.attributes + orgJetbrainsKotlinKlibArtifactType) - "org.gradle.jvm.environment",
922+
),
923+
configuration = "iosArm64ApiElements-published",
924+
),
925+
"net.mamoe.yamlkt:yamlkt:0.13.0" to ResolvedComponentWithArtifacts(
926+
artifacts = mutableListOf(
927+
),
928+
configuration = "iosArm64ApiElements-published",
929+
),
930+
).prettyPrinted,
931+
consumer.multiplatformExtension.iosArm64().compilationResolution().prettyPrinted
932+
)
933+
934+
assertEquals(
935+
mapOf<String, ResolvedComponentWithArtifacts>(
936+
"net.mamoe.yamlkt:yamlkt-js:0.13.0" to ResolvedComponentWithArtifacts(
937+
artifacts = mutableListOf(
938+
(kmpJsApiVariantAttributes + klibArtifact) - "org.gradle.jvm.environment",
939+
),
940+
configuration = "jsIrApiElements-published",
941+
),
942+
"net.mamoe.yamlkt:yamlkt:0.13.0" to ResolvedComponentWithArtifacts(
943+
artifacts = mutableListOf(
944+
),
945+
configuration = "jsIrApiElements-published",
946+
),
947+
).prettyPrinted,
948+
consumer.multiplatformExtension.js().compilationResolution().prettyPrinted
949+
)
950+
assertEquals(
951+
mapOf<String, ResolvedComponentWithArtifacts>(
952+
"net.mamoe.yamlkt:yamlkt-js:0.13.0" to ResolvedComponentWithArtifacts(
953+
artifacts = mutableListOf(
954+
(kmpJsRuntimeVariantAttributes + klibArtifact) - "org.gradle.jvm.environment",
955+
),
956+
configuration = "jsIrRuntimeElements-published",
957+
),
958+
"net.mamoe.yamlkt:yamlkt:0.13.0" to ResolvedComponentWithArtifacts(
959+
artifacts = mutableListOf(
960+
),
961+
configuration = "jsIrRuntimeElements-published",
962+
),
963+
).prettyPrinted,
964+
consumer.multiplatformExtension.js().runtimeResolution().prettyPrinted
965+
)
966+
967+
assertEquals(
968+
mapOf<String, ResolvedComponentWithArtifacts>(
969+
"net.mamoe.yamlkt:yamlkt:0.13.0" to ResolvedComponentWithArtifacts(
970+
artifacts = mutableListOf(
971+
preHmppKmpAttributes + libraryElementsJar + jarArtifact,
972+
),
973+
configuration = "commonMainMetadataElements",
974+
),
975+
).prettyPrinted,
976+
consumer.multiplatformExtension.wasmWasi().compilationResolution().prettyPrinted
977+
)
978+
assertEquals(
979+
mapOf<String, ResolvedComponentWithArtifacts>(
980+
"net.mamoe.yamlkt:yamlkt:0.13.0" to ResolvedComponentWithArtifacts(
981+
artifacts = mutableListOf(
982+
(kmpMetadataJarVariant.attributes + jarArtifact + libraryElementsJar) - "org.gradle.jvm.environment",
983+
),
984+
configuration = "metadataApiElements",
985+
),
986+
).prettyPrinted,
987+
consumer.multiplatformExtension.wasmWasi().runtimeResolution().prettyPrinted
988+
)
989+
}
990+
847991
@Test
848992
fun `uklib resolution - all configurations can resolve direct Gradle JVM dependencies`() {
849993
val repo = generateMockRepository(

0 commit comments

Comments
 (0)