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

Gradle, js, npm: proper disambiguation classifier for npm and tools configurations

Browse Source 
#KT-32293 Fixed
This commit is contained in:
Sergey Rostov
2019-08-06 11:53:41 +03:00
parent 1dc860f206
commit 99762193f9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
+3 -2
View File
@@ -15,6 +15,7 @@ import org.gradle.api.tasks.InputFiles
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
import org.jetbrains.kotlin.gradle.plugin.mpp.disambiguateName
import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf
import org.jetbrains.kotlin.gradle.targets.js.dukat.DukatCompilationResolverPlugin import org.jetbrains.kotlin.gradle.targets.js.dukat.DukatCompilationResolverPlugin
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency
@@ -87,7 +88,7 @@ internal class KotlinCompilationNpmResolver(
} }
private fun createAggregatedConfiguration(): Configuration { private fun createAggregatedConfiguration(): Configuration {
val all = project.configurations.create("${compilation.name}Npm") val all = project.configurations.create(compilation.disambiguateName("npm"))
all.usesPlatformOf(target) all.usesPlatformOf(target)
all.attributes.attribute(Usage.USAGE_ATTRIBUTE, KotlinUsages.consumerRuntimeUsage(target)) all.attributes.attribute(Usage.USAGE_ATTRIBUTE, KotlinUsages.consumerRuntimeUsage(target))
@@ -114,7 +115,7 @@ internal class KotlinCompilationNpmResolver(
val taskRequirements = projectResolver.taskRequirements.getTaskRequirements(compilation) val taskRequirements = projectResolver.taskRequirements.getTaskRequirements(compilation)
if (taskRequirements.isEmpty()) return null if (taskRequirements.isEmpty()) return null
val toolsConfiguration = project.configurations.create("${compilation.name}NpmTools") val toolsConfiguration = project.configurations.create(compilation.disambiguateName("npmTools"))
toolsConfiguration.isVisible = false toolsConfiguration.isVisible = false
toolsConfiguration.isCanBeConsumed = false toolsConfiguration.isCanBeConsumed = false