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

[Gradle, JS] Add fake common usage context for single js plugin publish

Browse Source 
#KT-38592 fixed
This commit is contained in:
Ilya Goncharov
2020-05-19 17:56:42 +03:00
parent 4f747072f4
commit a6812e5d6a
2 changed files with 21 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/KotlinJsTarget.kt
+6 -2
View File
@@ -84,11 +84,15 @@ constructor(
} }
override fun createUsageContexts(producingCompilation: KotlinCompilation<*>): Set<DefaultKotlinUsageContext> { override fun createUsageContexts(producingCompilation: KotlinCompilation<*>): Set<DefaultKotlinUsageContext> {
return super.createUsageContexts(producingCompilation) + val usageContexts = super.createUsageContexts(producingCompilation)
if (isMpp!!) return usageContexts
return usageContexts +
DefaultKotlinUsageContext( DefaultKotlinUsageContext(
compilation = compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME), compilation = compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME),
usage = project.usageByName("java-api-jars"), usage = project.usageByName("java-api-jars"),
dependencyConfigurationName = apiElementsConfigurationName, dependencyConfigurationName = commonFakeApiElementsConfigurationName,
overrideConfigurationArtifacts = emptySet() overrideConfigurationArtifacts = emptySet()
) )
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
+15
View File
@@ -11,6 +11,7 @@ import org.gradle.api.Task
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator.Companion.runTaskNameSuffix import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator.Companion.runTaskNameSuffix
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
import org.jetbrains.kotlin.gradle.plugin.mpp.DefaultKotlinUsageContext
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinTargetWithBinaries import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinTargetWithBinaries
import org.jetbrains.kotlin.gradle.plugin.mpp.disambiguateName import org.jetbrains.kotlin.gradle.plugin.mpp.disambiguateName
import org.jetbrains.kotlin.gradle.targets.js.JsAggregatingExecutionSource import org.jetbrains.kotlin.gradle.targets.js.JsAggregatingExecutionSource
@@ -48,6 +49,20 @@ constructor(
field = value field = value
} }
override fun createUsageContexts(producingCompilation: KotlinCompilation<*>): Set<DefaultKotlinUsageContext> {
val usageContexts = super.createUsageContexts(producingCompilation)
if (isMpp!!) return usageContexts
return usageContexts +
DefaultKotlinUsageContext(
compilation = compilations.getByName(MAIN_COMPILATION_NAME),
usage = project.usageByName("java-api-jars"),
dependencyConfigurationName = commonFakeApiElementsConfigurationName,
overrideConfigurationArtifacts = emptySet()
)
}
internal val commonFakeApiElementsConfigurationName: String internal val commonFakeApiElementsConfigurationName: String
get() = disambiguateName("commonFakeApiElements") get() = disambiguateName("commonFakeApiElements")