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

[Gradle] Ensure deprecated *DependenciesMetadata configurations carry necessary dependencies

Browse Source 
^KT-55929 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-01-16 14:47:02 +01:00
committed by Space Team
parent fbc39fcab1
commit cc684cce3d
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
+20 -1
View File
@@ -364,8 +364,27 @@ class KotlinMetadataTargetConfigurator :
} }
) )
if (sourceSet is DefaultKotlinSourceSet) @Suppress("DEPRECATION")
if (sourceSet is DefaultKotlinSourceSet) {
sourceSet.compileDependenciesTransformation = granularMetadataTransformation sourceSet.compileDependenciesTransformation = granularMetadataTransformation
/*
Older IDEs still rely on resolving the metadata configurations explicitly.
Dependencies will be coming from extending the newer 'resolvableMetadataConfiguration'.
the intransitiveMetadataConfigurationName will not extend this mechanism, since it only
relies on dependencies being added explicitly by the Kotlin Gradle Plugin
*/
listOf(
sourceSet.apiMetadataConfigurationName,
sourceSet.implementationMetadataConfigurationName,
sourceSet.compileOnlyMetadataConfigurationName
).forEach { configurationName ->
val configuration = project.configurations.getByName(configurationName)
configuration.extendsFrom(sourceSet.resolvableMetadataConfiguration)
granularMetadataTransformation.applyToConfiguration(configuration)
}
}
} }
/** Ensure that the [configuration] excludes the dependencies that are classified by this [GranularMetadataTransformation] as /** Ensure that the [configuration] excludes the dependencies that are classified by this [GranularMetadataTransformation] as