diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt index 996bd25e186..c33cafa9e02 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt @@ -159,7 +159,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : it.compilation = compilation it.entry = binary.linkTask.map { it.outputFile }.get() it.description = "build webpack ${type.name.toLowerCase()} bundle" - it.destinationDirectory = distribution.directory + it._destinationDirectory = distribution.directory commonWebpackConfigurations.forEach { configure -> it.configure() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 781c763aa71..a10b0cfa6a9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -194,7 +194,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : it.compilation = compilation it.description = "build webpack ${type.name.toLowerCase()} bundle" - it.destinationDirectory = distribution.directory + it._destinationDirectory = distribution.directory when (type) { KotlinJsBinaryType.PRODUCTION -> { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt index a5ea3689169..44760db03d1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt @@ -92,10 +92,11 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies { get() = project.convention.plugins["base"] as BasePluginConvention? @get:Internal - var destinationDirectory: File by property { - project.buildDir.resolve(baseConventions!!.distsDirName) - } - internal set + internal var _destinationDirectory: File? = null + + @get:Internal + val destinationDirectory: File + get() = _destinationDirectory ?: project.buildDir.resolve(baseConventions!!.distsDirName) @get:Internal var outputFileName: String by property {