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

[Gradle] Fix tests after deprecating and removing scoped Metadata Configurations

Browse Source
This commit is contained in:
Anton Lakotka
2023-01-04 21:34:28 +01:00
committed by Space Team
parent 3f8df88857
commit 6cda136566
4 changed files with 7 additions and 59 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/CommonizerIT.kt
-16
View File
@@ -269,14 +269,8 @@ class CommonizerIT : BaseGradleIT() {
}
private fun `test single native platform`(project: String) {
val posixInImplementationMetadataConfigurationRegex = Regex(""".*implementationMetadataConfiguration:.*([pP])osix""")
val posixInIntransitiveMetadataConfigurationRegex = Regex(""".*intransitiveMetadataConfiguration:.*([pP])osix""")
fun CompiledProject.containsPosixInImplementationMetadataConfiguration(): Boolean =
output.lineSequence().any { line ->
line.matches(posixInImplementationMetadataConfigurationRegex)
}
fun CompiledProject.containsPosixInIntransitiveMetadataConfiguration(): Boolean =
output.lineSequence().any { line ->
line.matches(posixInIntransitiveMetadataConfigurationRegex)
@@ -286,11 +280,6 @@ class CommonizerIT : BaseGradleIT() {
build(":p1:listNativePlatformMainDependencies", "-Pkotlin.mpp.enableIntransitiveMetadataConfiguration=false") {
assertSuccessful()
assertTrue(
containsPosixInImplementationMetadataConfiguration(),
"Expected dependency on posix in implementationMetadataConfiguration"
)
assertFalse(
containsPosixInIntransitiveMetadataConfiguration(),
"Expected **no** dependency on posix in intransitiveMetadataConfiguration"
@@ -300,11 +289,6 @@ class CommonizerIT : BaseGradleIT() {
build(":p1:listNativePlatformMainDependencies", "-Pkotlin.mpp.enableIntransitiveMetadataConfiguration=true") {
assertSuccessful()
assertFalse(
containsPosixInImplementationMetadataConfiguration(),
"Expected **no** posix dependency in implementationMetadataConfiguration"
)
assertTrue(
containsPosixInIntransitiveMetadataConfiguration(),
"Expected dependency on posix in intransitiveMetadataConfiguration"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+7 -15
View File
@@ -931,10 +931,8 @@ class NewMultiplatformIT : BaseGradleIT() {
task('printMetadataFiles') {
doFirst {
['Api', 'Implementation', 'CompileOnly'].each { kind ->
def configuration = configurations.getByName("commonMain${'$'}kind" + '$METADATA_CONFIGURATION_NAME_SUFFIX')
configuration.files.each { println '$pathPrefix' + configuration.name + '->' + it.name }
}
def configuration = configurations.getByName("commonMainResolvable" + '$METADATA_CONFIGURATION_NAME_SUFFIX')
configuration.files.each { println '$pathPrefix' + configuration.name + '->' + it.name }
}
}
""".trimIndent()
@@ -952,9 +950,7 @@ class NewMultiplatformIT : BaseGradleIT() {
.toSet()
Assert.assertEquals(
listOf("Api", "Implementation", "CompileOnly").map {
"commonMain$it$METADATA_CONFIGURATION_NAME_SUFFIX" to expectedFileName
}.toSet(),
setOf("commonMainResolvable$METADATA_CONFIGURATION_NAME_SUFFIX" to expectedFileName),
paths
)
}
@@ -1011,10 +1007,8 @@ class NewMultiplatformIT : BaseGradleIT() {
task('printMetadataFiles') {
doFirst {
['Api', 'Implementation', 'CompileOnly'].each { kind ->
def configuration = configurations.getByName("nodeJsMain${'$'}kind" + '$METADATA_CONFIGURATION_NAME_SUFFIX')
configuration.files.each { println '$pathPrefix' + configuration.name + '->' + it.name }
}
def configuration = configurations.getByName("nodeJsMainResolvable" + '$METADATA_CONFIGURATION_NAME_SUFFIX')
configuration.files.each { println '$pathPrefix' + configuration.name + '->' + it.name }
}
}
""".trimIndent()
@@ -1035,9 +1029,7 @@ class NewMultiplatformIT : BaseGradleIT() {
.toSet()
Assert.assertEquals(
listOf("Api", "Implementation", "CompileOnly").map {
"nodeJsMain$it$METADATA_CONFIGURATION_NAME_SUFFIX" to expectedFileName
}.toSet(),
setOf("nodeJsMainResolvable$METADATA_CONFIGURATION_NAME_SUFFIX" to expectedFileName),
paths
)
}
@@ -1062,7 +1054,7 @@ class NewMultiplatformIT : BaseGradleIT() {
"\n" + """
task('printMetadataFiles') {
doFirst {
configurations.getByName('commonMainImplementation$METADATA_CONFIGURATION_NAME_SUFFIX')
configurations.getByName('commonMainResolvable$METADATA_CONFIGURATION_NAME_SUFFIX')
.files.each { println '$pathPrefix' + it.name }
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46142-singleNativeTarget/p1/build.gradle.kts
-14
View File
@@ -36,24 +36,10 @@ kotlin {
tasks.register("listNativePlatformMainDependencies") {
doLast {
val implementationMetadataConfigurationDependencies = project.configurations.getByName(
nativePlatformMain.implementationMetadataConfigurationName
).files
val intransitiveMetadataConfigurationDependencies = project.configurations.findByName(
"nativePlatformMainIntransitiveDependenciesMetadata"
)?.files.orEmpty()
val dependencies = implementationMetadataConfigurationDependencies +
intransitiveMetadataConfigurationDependencies
logger.quiet("NativePlatformMainDependency | Count: ${dependencies.size}")
implementationMetadataConfigurationDependencies.forEach { dependencyFile ->
logger.quiet("implementationMetadataConfiguration: ${dependencyFile.path}")
}
intransitiveMetadataConfigurationDependencies.forEach { dependencyFile ->
logger.quiet("intransitiveMetadataConfiguration: ${dependencyFile.path}")
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46234-singleNativeTarget/p1/build.gradle.kts
-14
View File
@@ -35,24 +35,10 @@ kotlin {
tasks.register("listNativePlatformMainDependencies") {
doLast {
val implementationMetadataConfigurationDependencies = project.configurations.getByName(
nativePlatformMain.implementationMetadataConfigurationName
).files
val intransitiveMetadataConfigurationDependencies = project.configurations.findByName(
"nativePlatformMainIntransitiveDependenciesMetadata"
)?.files.orEmpty()
val dependencies = implementationMetadataConfigurationDependencies +
intransitiveMetadataConfigurationDependencies
logger.quiet("NativePlatformMainDependency | Count: ${dependencies.size}")
implementationMetadataConfigurationDependencies.forEach { dependencyFile ->
logger.quiet("implementationMetadataConfiguration: ${dependencyFile.path}")
}
intransitiveMetadataConfigurationDependencies.forEach { dependencyFile ->
logger.quiet("intransitiveMetadataConfiguration: ${dependencyFile.path}")
}