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

[Gradle, JS] Fix case with null distribution

Browse Source
This commit is contained in:
Ilya Goncharov
2019-12-02 17:36:08 +03:00
parent c267357596
commit 22cb6fa836
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/subtargets/KotlinBrowserJs.kt
+3 -2
View File
@@ -150,7 +150,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
val basePluginConvention = project.convention.plugins["base"] as BasePluginConvention? val basePluginConvention = project.convention.plugins["base"] as BasePluginConvention?
distribution.directory = distribution.directory ?: project.buildDir.resolve(basePluginConvention!!.distsDirName) val baseDist = project.buildDir.resolve(basePluginConvention!!.distsDirName)
distribution.directory = distribution.directory ?: baseDist
val distributionTask = project.registerTask<Copy>( val distributionTask = project.registerTask<Copy>(
disambiguateCamelCased( disambiguateCamelCased(
@@ -158,7 +159,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
) )
) { ) {
it.from(compilation.output.resourcesDir) it.from(compilation.output.resourcesDir)
it.into(distribution.directory!!) it.into(distribution.directory ?: baseDist)
} }
val assembleTask = project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME) val assembleTask = project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME)