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

Create runtime software component usage only for runnables;

Browse Source 
Also make Kotlin2JsCompilation a compilation to runnable files
This commit is contained in:
Sergey Igushkin
2018-07-28 18:24:21 +03:00
parent 209d0cf6a1
commit d4f44e63cd
2 changed files with 16 additions and 5 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/plugin/mpp/kotlinCompilations.kt
+1 -1
View File
@@ -223,7 +223,7 @@ class KotlinJsCompilation(
target: KotlinTarget, target: KotlinTarget,
name: String, name: String,
override val output: SourceSetOutput override val output: SourceSetOutput
) : AbstractKotlinCompilation(target, name) ) : AbstractKotlinCompilationToRunnableFiles(target, name)
class KotlinCommonCompilation( class KotlinCommonCompilation(
target: KotlinTarget, target: KotlinTarget,
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt
+15 -4
View File
@@ -11,6 +11,7 @@ import org.gradle.api.attributes.AttributeContainer
import org.gradle.api.internal.component.UsageContext import org.gradle.api.internal.component.UsageContext
import org.gradle.api.plugins.JavaPlugin import org.gradle.api.plugins.JavaPlugin
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationToRunnableFiles
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
@@ -36,10 +37,20 @@ abstract class AbstractKotlinTarget (
override fun toString(): String = "target $name ($platformType)" override fun toString(): String = "target $name ($platformType)"
override fun createUsageContexts(): Set<UsageContext> = setOf( override fun createUsageContexts(): Set<UsageContext> =
KotlinPlatformUsageContext(project, this, KotlinSoftwareComponent.kotlinApiUsage(project), apiElementsConfigurationName), setOf(
KotlinPlatformUsageContext(project, this, KotlinSoftwareComponent.kotlinRuntimeUsage(project), runtimeElementsConfigurationName) KotlinPlatformUsageContext(
) project, this, KotlinSoftwareComponent.kotlinApiUsage(project), apiElementsConfigurationName
)
) + if (compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME) is KotlinCompilationToRunnableFiles)
setOf(
KotlinPlatformUsageContext(
project,
this,
KotlinSoftwareComponent.kotlinRuntimeUsage(project),
runtimeElementsConfigurationName
)
) else emptyList()
} }
internal fun KotlinTarget.disambiguateName(simpleName: String) = internal fun KotlinTarget.disambiguateName(simpleName: String) =