jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-07 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Gradle, JS] Use RegularFile to not explicit dependsOn

Browse Source 
^KT-32273 fixed
^KT-36451 fixed
^KT-37258 fixed
This commit is contained in:
Ilya Goncharov
2020-06-02 17:28:41 +03:00
parent e27bd04ba2
commit 402dfd5da7
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
View File

@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.targets.js.ir
import org.gradle.api.Task
import org.gradle.api.file.RegularFile
import org.gradle.api.tasks.Copy
import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
@@ -177,13 +178,12 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
dependsOn(
nodeJs.npmInstallTask,
binary.linkTask,
target.project.tasks.getByName(compilation.processResourcesTaskName)
)
configureOptimization(type)
entryProperty.set(binary.linkTask.map { it.outputFile })
entryProperty.set(binary.linkTask.map { RegularFile { it.outputFile } })
commonRunConfigurations.forEach { configure ->
configure()

9
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
View File

@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.targets.js.subtargets
import org.gradle.api.Task
import org.gradle.api.file.RegularFile
import org.gradle.api.tasks.Copy
import org.gradle.api.tasks.TaskProvider
import org.gradle.language.base.plugins.LifecycleBasePlugin
@@ -232,13 +233,13 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
entryProperty.set(
actualDceTaskProvider.map {
it.destinationDir
.resolve(compilation.compileKotlinTask.outputFile.name)
RegularFile {
it.destinationDir
.resolve(compilation.compileKotlinTask.outputFile.name)
}
}
)
dependsOn(actualDceTaskProvider)
resolveFromModulesFirst = true
commonRunConfigurations.forEach { configure ->

8
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
View File

@@ -8,9 +8,9 @@ package org.jetbrains.kotlin.gradle.targets.js.webpack
import org.gradle.api.DefaultTask
import org.gradle.api.Incubating
import org.gradle.api.file.FileCollection
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.internal.file.FileResolver
import org.gradle.api.plugins.BasePluginConvention
import org.gradle.api.provider.Property
import org.gradle.api.tasks.*
import org.gradle.deployment.internal.Deployment
import org.gradle.deployment.internal.DeploymentHandle
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode
import org.jetbrains.kotlin.gradle.testing.internal.reportsDir
import org.jetbrains.kotlin.gradle.utils.injected
import org.jetbrains.kotlin.gradle.utils.newProperty
import org.jetbrains.kotlin.gradle.utils.newFileProperty
import org.jetbrains.kotlin.gradle.utils.property
import java.io.File
import javax.inject.Inject
@@ -57,14 +57,14 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
@get:Internal
var entry: File
get() = entryProperty.get()
get() = entryProperty.asFile.get()
set(value) {
entryProperty.set(value)
}
@get:PathSensitive(PathSensitivity.ABSOLUTE)
@get:InputFile
val entryProperty: Property<File> = project.newProperty {
val entryProperty: RegularFileProperty = project.newFileProperty {
compilation.compileKotlinTask.outputFile
}