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

[Gradle] Implement IdeaKotlinBinaryCoordinates.displayString and identityString

Browse Source 
^KT-60053 In Progress
This commit is contained in:
Sebastian Sellmair
2023-07-10 20:20:13 +02:00
committed by Space Team
parent e3f0fa4257
commit 7af254fbf2
8 changed files with 192 additions and 48 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/dependencyResolutionTests/ResolvableMetadataConfigurationTest.kt
+3 -3
View File
@@ -77,7 +77,7 @@ class ResolvableMetadataConfigurationTest {
/* Check IDE resolution for commonMain */
project.kotlinIdeMultiplatformImport.resolveDependencies("commonMain")
.assertMatches(
binaryCoordinates(Regex("com.squareup.okio:okio(-.*)?:3.3.0:.*")),
binaryCoordinates(Regex("com.squareup.okio:okio(-.*)?:.*:3.3.0")),
binaryCoordinates(Regex("org.jetbrains.kotlin.*"))
)
@@ -86,8 +86,8 @@ class ResolvableMetadataConfigurationTest {
.filterIsInstance<IdeaKotlinBinaryDependency>()
.filter { it.coordinates?.group.orEmpty() in setOf("com.squareup.okio", "com.arkivanov.mvikotlin") }
.assertMatches(
binaryCoordinates(Regex("com.squareup.okio:okio(-.*)?:3.3.0:.*")),
binaryCoordinates(Regex("com.arkivanov.mvikotlin:mvikotlin(-*)?:3.0.2:.*")),
binaryCoordinates(Regex("com.squareup.okio:okio(-.*)?:.*:3.3.0")),
binaryCoordinates(Regex("com.arkivanov.mvikotlin:mvikotlin(-*)?:.*:3.0.2")),
)
}
}
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeNativePlatformDependencyResolverTest.kt
+4 -4
View File
@@ -35,8 +35,8 @@ class IdeNativePlatformDependencyResolverTest {
val linuxX64Test = kotlin.sourceSets.getByName("linuxX64Test")
val dependencies = listOf(
binaryCoordinates("org.jetbrains.kotlin.native:posix:${project.konanVersion}:$LINUX_X64"),
binaryCoordinates(Regex("""org\.jetbrains\.kotlin\.native:.*:${project.konanVersion}:$LINUX_X64"""))
binaryCoordinates("org.jetbrains.kotlin.native:posix:$LINUX_X64:${project.konanVersion}"),
binaryCoordinates(Regex("""org\.jetbrains\.kotlin\.native:.*:$LINUX_X64:${project.konanVersion}"""))
)
IdeNativePlatformDependencyResolver.resolve(commonMain).assertMatches(dependencies)
@@ -60,8 +60,8 @@ class IdeNativePlatformDependencyResolverTest {
val macosArm64Test = kotlin.sourceSets.getByName("macosArm64Test")
val dependencies = listOf(
binaryCoordinates("org.jetbrains.kotlin.native:CoreFoundation:${project.konanVersion}:$MACOS_ARM64"),
binaryCoordinates(Regex("""org\.jetbrains\.kotlin\.native:.*:${project.konanVersion}:$MACOS_ARM64"""))
binaryCoordinates("org.jetbrains.kotlin.native:CoreFoundation:$MACOS_ARM64:${project.konanVersion}"),
binaryCoordinates(Regex("""org\.jetbrains\.kotlin\.native:.*:$MACOS_ARM64:${project.konanVersion}"""))
)
IdeNativePlatformDependencyResolver.resolve(commonMain).assertMatches(dependencies)
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeSourcesAndDocumentationResolutionTest.kt
+7 -7
View File
@@ -64,9 +64,9 @@ class IdeSourcesAndDocumentationResolutionTest {
/* Check commonMain&commonTest */
run {
val expectedDependencies = listOf(
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:3.0.2:commonMain"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:0.4.2:commonMain"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:0.4.2:commonMain"),
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:commonMain:3.0.2"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:commonMain:0.4.2"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:commonMain:0.4.2"),
)
val resolvedDependencies = resolveDependencySources(commonMain)
@@ -78,10 +78,10 @@ class IdeSourcesAndDocumentationResolutionTest {
/* Check nativeMain&nativeTest */
run {
val expectedDependencies = listOf(
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:3.0.2:commonMain"),
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:3.0.2:jsNativeMain"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:0.4.2:commonMain"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:0.4.2:commonMain"),
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:commonMain:3.0.2"),
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:jsNativeMain:3.0.2"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:commonMain:0.4.2"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:commonMain:0.4.2"),
IdeNativeStdlibDependencyResolver.nativeStdlibCoordinates(project),
binaryCoordinates(Regex(".*stdlib-common:.*")) /* KT-56278 */
)
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt
+10 -10
View File
@@ -49,24 +49,24 @@ class IdeTransformedMetadataDependencyResolverTest {
IdeTransformedMetadataDependencyResolver.resolve(commonMain)
.assertMatches(
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:3.0.2:commonMain"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:0.4.2:commonMain"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:0.4.2:commonMain")
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:commonMain:3.0.2"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:commonMain:0.4.2"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:commonMain:0.4.2")
)
IdeTransformedMetadataDependencyResolver.resolve(commonTest)
.assertMatches(
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:3.0.2:commonMain"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:0.4.2:commonMain"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:0.4.2:commonMain")
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:commonMain:3.0.2"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:commonMain:0.4.2"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:commonMain:0.4.2")
)
IdeTransformedMetadataDependencyResolver.resolve(linuxMain)
.assertMatches(
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:3.0.2:commonMain"),
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:3.0.2:jsNativeMain"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:0.4.2:commonMain"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:0.4.2:commonMain")
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:commonMain:3.0.2"),
binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin:jsNativeMain:3.0.2"),
binaryCoordinates("com.arkivanov.essenty:lifecycle:commonMain:0.4.2"),
binaryCoordinates("com.arkivanov.essenty:instance-keeper:commonMain:0.4.2")
)
}