[Gradle, JS] Use RegularFile to not explicit dependsOn
^KT-32273 fixed ^KT-36451 fixed ^KT-37258 fixed
This commit is contained in:
+2
-2
@@ -6,6 +6,7 @@
|
|||||||
package org.jetbrains.kotlin.gradle.targets.js.ir
|
package org.jetbrains.kotlin.gradle.targets.js.ir
|
||||||
|
|
||||||
import org.gradle.api.Task
|
import org.gradle.api.Task
|
||||||
|
import org.gradle.api.file.RegularFile
|
||||||
import org.gradle.api.tasks.Copy
|
import org.gradle.api.tasks.Copy
|
||||||
import org.gradle.language.base.plugins.LifecycleBasePlugin
|
import org.gradle.language.base.plugins.LifecycleBasePlugin
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
|
import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
|
||||||
@@ -177,13 +178,12 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
|
|||||||
|
|
||||||
dependsOn(
|
dependsOn(
|
||||||
nodeJs.npmInstallTask,
|
nodeJs.npmInstallTask,
|
||||||
binary.linkTask,
|
|
||||||
target.project.tasks.getByName(compilation.processResourcesTaskName)
|
target.project.tasks.getByName(compilation.processResourcesTaskName)
|
||||||
)
|
)
|
||||||
|
|
||||||
configureOptimization(type)
|
configureOptimization(type)
|
||||||
|
|
||||||
entryProperty.set(binary.linkTask.map { it.outputFile })
|
entryProperty.set(binary.linkTask.map { RegularFile { it.outputFile } })
|
||||||
|
|
||||||
commonRunConfigurations.forEach { configure ->
|
commonRunConfigurations.forEach { configure ->
|
||||||
configure()
|
configure()
|
||||||
|
|||||||
+5
-4
@@ -6,6 +6,7 @@
|
|||||||
package org.jetbrains.kotlin.gradle.targets.js.subtargets
|
package org.jetbrains.kotlin.gradle.targets.js.subtargets
|
||||||
|
|
||||||
import org.gradle.api.Task
|
import org.gradle.api.Task
|
||||||
|
import org.gradle.api.file.RegularFile
|
||||||
import org.gradle.api.tasks.Copy
|
import org.gradle.api.tasks.Copy
|
||||||
import org.gradle.api.tasks.TaskProvider
|
import org.gradle.api.tasks.TaskProvider
|
||||||
import org.gradle.language.base.plugins.LifecycleBasePlugin
|
import org.gradle.language.base.plugins.LifecycleBasePlugin
|
||||||
@@ -232,13 +233,13 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
|
|||||||
|
|
||||||
entryProperty.set(
|
entryProperty.set(
|
||||||
actualDceTaskProvider.map {
|
actualDceTaskProvider.map {
|
||||||
it.destinationDir
|
RegularFile {
|
||||||
.resolve(compilation.compileKotlinTask.outputFile.name)
|
it.destinationDir
|
||||||
|
.resolve(compilation.compileKotlinTask.outputFile.name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
dependsOn(actualDceTaskProvider)
|
|
||||||
|
|
||||||
resolveFromModulesFirst = true
|
resolveFromModulesFirst = true
|
||||||
|
|
||||||
commonRunConfigurations.forEach { configure ->
|
commonRunConfigurations.forEach { configure ->
|
||||||
|
|||||||
+4
-4
@@ -8,9 +8,9 @@ package org.jetbrains.kotlin.gradle.targets.js.webpack
|
|||||||
import org.gradle.api.DefaultTask
|
import org.gradle.api.DefaultTask
|
||||||
import org.gradle.api.Incubating
|
import org.gradle.api.Incubating
|
||||||
import org.gradle.api.file.FileCollection
|
import org.gradle.api.file.FileCollection
|
||||||
|
import org.gradle.api.file.RegularFileProperty
|
||||||
import org.gradle.api.internal.file.FileResolver
|
import org.gradle.api.internal.file.FileResolver
|
||||||
import org.gradle.api.plugins.BasePluginConvention
|
import org.gradle.api.plugins.BasePluginConvention
|
||||||
import org.gradle.api.provider.Property
|
|
||||||
import org.gradle.api.tasks.*
|
import org.gradle.api.tasks.*
|
||||||
import org.gradle.deployment.internal.Deployment
|
import org.gradle.deployment.internal.Deployment
|
||||||
import org.gradle.deployment.internal.DeploymentHandle
|
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.targets.js.webpack.KotlinWebpackConfig.Mode
|
||||||
import org.jetbrains.kotlin.gradle.testing.internal.reportsDir
|
import org.jetbrains.kotlin.gradle.testing.internal.reportsDir
|
||||||
import org.jetbrains.kotlin.gradle.utils.injected
|
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 org.jetbrains.kotlin.gradle.utils.property
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@@ -57,14 +57,14 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
|
|||||||
|
|
||||||
@get:Internal
|
@get:Internal
|
||||||
var entry: File
|
var entry: File
|
||||||
get() = entryProperty.get()
|
get() = entryProperty.asFile.get()
|
||||||
set(value) {
|
set(value) {
|
||||||
entryProperty.set(value)
|
entryProperty.set(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
@get:PathSensitive(PathSensitivity.ABSOLUTE)
|
@get:PathSensitive(PathSensitivity.ABSOLUTE)
|
||||||
@get:InputFile
|
@get:InputFile
|
||||||
val entryProperty: Property<File> = project.newProperty {
|
val entryProperty: RegularFileProperty = project.newFileProperty {
|
||||||
compilation.compileKotlinTask.outputFile
|
compilation.compileKotlinTask.outputFile
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user