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

[Gradle] Update IdeStdlibResolutionTest to reflect changes in stdlib

Browse Source 
^KT-60901 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-08-09 11:39:36 +02:00
committed by Space Team
parent fa2b21e71b
commit bafb1aac80
1 changed files with 50 additions and 17 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/tcs/IdeStdlibResolutionTest.kt
+50 -17
View File
@@ -36,10 +36,25 @@ class IdeStdlibResolutionTest {
project.evaluate() project.evaluate()
project.assertStdlibDependencies(kotlin.sourceSets.getByName("commonMain"), jvmStdlibDependencies(kotlin) + commonStdlibDependency(kotlin)) project.assertStdlibDependencies(
project.assertStdlibDependencies(kotlin.sourceSets.getByName("commonTest"), jvmStdlibDependencies(kotlin) + commonStdlibDependency(kotlin)) kotlin.sourceSets.getByName("commonMain"),
project.assertStdlibDependencies(kotlin.sourceSets.getByName("jvmMain"), jvmStdlibDependencies(kotlin)) jvmStdlibDependencies(kotlin)
project.assertStdlibDependencies(kotlin.sourceSets.getByName("jvmTest"), jvmStdlibDependencies(kotlin)) )
project.assertStdlibDependencies(
kotlin.sourceSets.getByName("commonTest"),
jvmStdlibDependencies(kotlin)
)
project.assertStdlibDependencies(
kotlin.sourceSets.getByName("jvmMain"),
jvmStdlibDependencies(kotlin)
)
project.assertStdlibDependencies(
kotlin.sourceSets.getByName("jvmTest"),
jvmStdlibDependencies(kotlin)
)
} }
@Test @Test
@@ -66,10 +81,25 @@ class IdeStdlibResolutionTest {
project.evaluate() project.evaluate()
project.assertStdlibDependencies(kotlin.sourceSets.getByName("commonMain"), listOf(commonStdlibDependency(kotlin), jsStdlibDependency(kotlin))) project.assertStdlibDependencies(
project.assertStdlibDependencies(kotlin.sourceSets.getByName("commonTest"), listOf(commonStdlibDependency(kotlin), jsStdlibDependency(kotlin))) kotlin.sourceSets.getByName("commonMain"),
project.assertStdlibDependencies(kotlin.sourceSets.getByName("jsMain"), jsStdlibDependency(kotlin)) listOf(jsStdlibDependency(kotlin))
project.assertStdlibDependencies(kotlin.sourceSets.getByName("jsTest"), jsStdlibDependency(kotlin)) )
project.assertStdlibDependencies(
kotlin.sourceSets.getByName("commonTest"),
listOf(jsStdlibDependency(kotlin))
)
project.assertStdlibDependencies(
kotlin.sourceSets.getByName("jsMain"),
jsStdlibDependency(kotlin)
)
project.assertStdlibDependencies(
kotlin.sourceSets.getByName("jsTest"),
jsStdlibDependency(kotlin)
)
} }
@Test @Test
@@ -83,8 +113,8 @@ class IdeStdlibResolutionTest {
project.evaluate() project.evaluate()
project.assertStdlibDependencies(kotlin.sourceSets.getByName("commonMain"), commonStdlibDependency(kotlin)) project.assertStdlibDependencies(kotlin.sourceSets.getByName("commonMain"), stdlibCommonMainDependency(kotlin))
project.assertStdlibDependencies(kotlin.sourceSets.getByName("commonTest"), commonStdlibDependency(kotlin)) project.assertStdlibDependencies(kotlin.sourceSets.getByName("commonTest"), stdlibCommonMainDependency(kotlin))
project.assertStdlibDependencies(kotlin.sourceSets.getByName("jvmMain"), jvmStdlibDependencies(kotlin)) project.assertStdlibDependencies(kotlin.sourceSets.getByName("jvmMain"), jvmStdlibDependencies(kotlin))
project.assertStdlibDependencies(kotlin.sourceSets.getByName("jvmTest"), jvmStdlibDependencies(kotlin)) project.assertStdlibDependencies(kotlin.sourceSets.getByName("jvmTest"), jvmStdlibDependencies(kotlin))
project.assertStdlibDependencies(kotlin.sourceSets.getByName("linuxMain"), nativeStdlibDependency(kotlin)) project.assertStdlibDependencies(kotlin.sourceSets.getByName("linuxMain"), nativeStdlibDependency(kotlin))
@@ -114,10 +144,10 @@ class IdeStdlibResolutionTest {
project.evaluate() project.evaluate()
project.assertStdlibDependencies(commonMain, commonStdlibDependency(kotlin)) project.assertStdlibDependencies(commonMain, stdlibCommonMainDependency(kotlin))
project.assertStdlibDependencies(commonTest, commonStdlibDependency(kotlin)) project.assertStdlibDependencies(commonTest, stdlibCommonMainDependency(kotlin))
project.assertStdlibDependencies(jvmIntermediateMain, jvmStdlibDependencies(kotlin) + commonStdlibDependency(kotlin)) project.assertStdlibDependencies(jvmIntermediateMain, jvmStdlibDependencies(kotlin))
project.assertStdlibDependencies(jvmIntermediateTest, jvmStdlibDependencies(kotlin) + commonStdlibDependency(kotlin)) project.assertStdlibDependencies(jvmIntermediateTest, jvmStdlibDependencies(kotlin))
} }
@Test @Test
@@ -180,7 +210,7 @@ class IdeStdlibResolutionTest {
nativeStdlibDependency(kotlin), nativeStdlibDependency(kotlin),
/* See: KT-56278: We still need stdlib-common for shared native source sets */ /* See: KT-56278: We still need stdlib-common for shared native source sets */
commonStdlibDependency(kotlin) stdlibCommonMainDependency(kotlin)
) )
) )
project.assertStdlibDependencies( project.assertStdlibDependencies(
@@ -188,7 +218,7 @@ class IdeStdlibResolutionTest {
nativeStdlibDependency(kotlin), nativeStdlibDependency(kotlin),
/* See: KT-56278: We still need stdlib-common for shared native source sets */ /* See: KT-56278: We still need stdlib-common for shared native source sets */
commonStdlibDependency(kotlin) stdlibCommonMainDependency(kotlin)
) )
) )
} }
@@ -234,7 +264,10 @@ class IdeStdlibResolutionTest {
repositories.google() repositories.google()
} }
private fun commonStdlibDependency(kotlin: KotlinMultiplatformExtension) = /**
* Refers to the 'commonMain' source set of the kotlin stdlib
*/
private fun stdlibCommonMainDependency(kotlin: KotlinMultiplatformExtension) =
binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib:commonMain:${kotlin.coreLibrariesVersion}") binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib:commonMain:${kotlin.coreLibrariesVersion}")
private fun jvmStdlibDependencies(kotlin: KotlinMultiplatformExtension) = listOf( private fun jvmStdlibDependencies(kotlin: KotlinMultiplatformExtension) = listOf(