[Gradle, JS] Fix after rebase

This commit is contained in:
Ilya Goncharov
2020-03-20 12:55:50 +03:00
parent a07425e7b0
commit dd7f10e76e
3 changed files with 7 additions and 6 deletions
@@ -159,7 +159,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
it.compilation = compilation it.compilation = compilation
it.entry = binary.linkTask.map { it.outputFile }.get() it.entry = binary.linkTask.map { it.outputFile }.get()
it.description = "build webpack ${type.name.toLowerCase()} bundle" it.description = "build webpack ${type.name.toLowerCase()} bundle"
it.destinationDirectory = distribution.directory it._destinationDirectory = distribution.directory
commonWebpackConfigurations.forEach { configure -> commonWebpackConfigurations.forEach { configure ->
it.configure() it.configure()
@@ -194,7 +194,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
it.compilation = compilation it.compilation = compilation
it.description = "build webpack ${type.name.toLowerCase()} bundle" it.description = "build webpack ${type.name.toLowerCase()} bundle"
it.destinationDirectory = distribution.directory it._destinationDirectory = distribution.directory
when (type) { when (type) {
KotlinJsBinaryType.PRODUCTION -> { KotlinJsBinaryType.PRODUCTION -> {
@@ -92,10 +92,11 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
get() = project.convention.plugins["base"] as BasePluginConvention? get() = project.convention.plugins["base"] as BasePluginConvention?
@get:Internal @get:Internal
var destinationDirectory: File by property { internal var _destinationDirectory: File? = null
project.buildDir.resolve(baseConventions!!.distsDirName)
} @get:Internal
internal set val destinationDirectory: File
get() = _destinationDirectory ?: project.buildDir.resolve(baseConventions!!.distsDirName)
@get:Internal @get:Internal
var outputFileName: String by property { var outputFileName: String by property {