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

[Gradle] Fix warnings in CreateTargetConfigurationsSideEffect

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-08 22:02:53 +01:00
committed by Space Team
parent 1ad9462c72
commit aba89b6676
1 changed files with 14 additions and 9 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/CreateTargetConfigurationsSideEffect.kt
+14 -9
View File
@@ -8,8 +8,6 @@ package org.jetbrains.kotlin.gradle.targets
import org.gradle.api.attributes.Category import org.gradle.api.attributes.Category
import org.gradle.api.attributes.Usage import org.gradle.api.attributes.Usage
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.categoryByName
import org.jetbrains.kotlin.gradle.plugin.launch
import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.*
import org.jetbrains.kotlin.gradle.plugin.mpp.configureSourcesPublicationAttributes import org.jetbrains.kotlin.gradle.plugin.mpp.configureSourcesPublicationAttributes
import org.jetbrains.kotlin.gradle.plugin.mpp.internal import org.jetbrains.kotlin.gradle.plugin.mpp.internal
@@ -29,8 +27,9 @@ internal val CreateTargetConfigurationsSideEffect = KotlinTargetSideEffect { tar
val compileConfiguration = mainCompilation.internal.configurations.deprecatedCompileConfiguration val compileConfiguration = mainCompilation.internal.configurations.deprecatedCompileConfiguration
val implementationConfiguration = configurations.maybeCreateDependencyScope(mainCompilation.implementationConfigurationName) val implementationConfiguration = configurations.maybeCreateDependencyScope(mainCompilation.implementationConfigurationName)
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
val runtimeOnlyConfiguration = when (mainCompilation) { val runtimeOnlyConfiguration = when (mainCompilation) {
is KotlinCompilationToRunnableFiles<*> -> configurations.maybeCreateDependencyScope(mainCompilation.runtimeOnlyConfigurationName) is DeprecatedKotlinCompilationToRunnableFiles<*> -> configurations.maybeCreateDependencyScope(mainCompilation.runtimeOnlyConfigurationName)
else -> null else -> null
} }
@@ -40,14 +39,16 @@ internal val CreateTargetConfigurationsSideEffect = KotlinTargetSideEffect { tar
attributes.setAttribute(Usage.USAGE_ATTRIBUTE, KotlinUsages.producerApiUsage(target)) attributes.setAttribute(Usage.USAGE_ATTRIBUTE, KotlinUsages.producerApiUsage(target))
attributes.setAttribute(Category.CATEGORY_ATTRIBUTE, project.categoryByName(Category.LIBRARY)) attributes.setAttribute(Category.CATEGORY_ATTRIBUTE, project.categoryByName(Category.LIBRARY))
extendsFrom(configurations.maybeCreateDependencyScope(mainCompilation.apiConfigurationName)) extendsFrom(configurations.maybeCreateDependencyScope(mainCompilation.apiConfigurationName))
if (mainCompilation is KotlinCompilationToRunnableFiles) { @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
if (mainCompilation is DeprecatedKotlinCompilationToRunnableFiles) {
val runtimeConfiguration = mainCompilation.internal.configurations.deprecatedRuntimeConfiguration val runtimeConfiguration = mainCompilation.internal.configurations.deprecatedRuntimeConfiguration
runtimeConfiguration?.let { extendsFrom(it) } runtimeConfiguration?.let { extendsFrom(it) }
} }
usesPlatformOf(target) usesPlatformOf(target)
} }
if (mainCompilation is KotlinCompilationToRunnableFiles<*>) { @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
if (mainCompilation is DeprecatedKotlinCompilationToRunnableFiles<*>) {
configurations.maybeCreateConsumable(target.runtimeElementsConfigurationName).apply { configurations.maybeCreateConsumable(target.runtimeElementsConfigurationName).apply {
description = "Elements of runtime for main." description = "Elements of runtime for main."
isVisible = false isVisible = false
@@ -55,8 +56,7 @@ internal val CreateTargetConfigurationsSideEffect = KotlinTargetSideEffect { tar
attributes.setAttribute(Category.CATEGORY_ATTRIBUTE, project.categoryByName(Category.LIBRARY)) attributes.setAttribute(Category.CATEGORY_ATTRIBUTE, project.categoryByName(Category.LIBRARY))
val runtimeConfiguration = mainCompilation.internal.configurations.deprecatedRuntimeConfiguration val runtimeConfiguration = mainCompilation.internal.configurations.deprecatedRuntimeConfiguration
extendsFrom(implementationConfiguration) extendsFrom(implementationConfiguration)
if (runtimeOnlyConfiguration != null) extendsFrom(runtimeOnlyConfiguration)
extendsFrom(runtimeOnlyConfiguration)
runtimeConfiguration?.let { extendsFrom(it) } runtimeConfiguration?.let { extendsFrom(it) }
usesPlatformOf(target) usesPlatformOf(target)
} }
@@ -73,8 +73,10 @@ internal val CreateTargetConfigurationsSideEffect = KotlinTargetSideEffect { tar
val testCompilation = target.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME) val testCompilation = target.compilations.getByName(KotlinCompilation.TEST_COMPILATION_NAME)
val compileTestsConfiguration = testCompilation.internal.configurations.deprecatedCompileConfiguration val compileTestsConfiguration = testCompilation.internal.configurations.deprecatedCompileConfiguration
val testImplementationConfiguration = configurations.maybeCreateDependencyScope(testCompilation.implementationConfigurationName) val testImplementationConfiguration = configurations.maybeCreateDependencyScope(testCompilation.implementationConfigurationName)
@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
val testRuntimeOnlyConfiguration = when (testCompilation) { val testRuntimeOnlyConfiguration = when (testCompilation) {
is KotlinCompilationToRunnableFiles<*> -> configurations.maybeCreateDependencyScope(testCompilation.runtimeOnlyConfigurationName) is DeprecatedKotlinCompilationToRunnableFiles<*> -> configurations.maybeCreateDependencyScope(testCompilation.runtimeOnlyConfigurationName)
else -> null else -> null
} }
@@ -82,7 +84,10 @@ internal val CreateTargetConfigurationsSideEffect = KotlinTargetSideEffect { tar
testImplementationConfiguration.extendsFrom(implementationConfiguration) testImplementationConfiguration.extendsFrom(implementationConfiguration)
testRuntimeOnlyConfiguration?.extendsFrom(runtimeOnlyConfiguration) testRuntimeOnlyConfiguration?.extendsFrom(runtimeOnlyConfiguration)
if (mainCompilation is KotlinCompilationToRunnableFiles && testCompilation is KotlinCompilationToRunnableFiles) { @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
if (mainCompilation is DeprecatedKotlinCompilationToRunnableFiles &&
testCompilation is DeprecatedKotlinCompilationToRunnableFiles
) {
val runtimeConfiguration = mainCompilation.internal.configurations.deprecatedRuntimeConfiguration val runtimeConfiguration = mainCompilation.internal.configurations.deprecatedRuntimeConfiguration
val testRuntimeConfiguration = testCompilation.internal.configurations.deprecatedRuntimeConfiguration val testRuntimeConfiguration = testCompilation.internal.configurations.deprecatedRuntimeConfiguration
runtimeConfiguration?.let { testRuntimeConfiguration?.extendsFrom(it) } runtimeConfiguration?.let { testRuntimeConfiguration?.extendsFrom(it) }