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

[Gradle, JS] Distribution task depends on processResources

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-27 11:36:49 +03:00
parent 1ba8b52856
commit a2b774b186
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+9
View File
@@ -528,5 +528,14 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) :
assertFileExists("app/build/distributions/app.js") assertFileExists("app/build/distributions/app.js")
assertFileExists("app/build/distributions/app.js.map") assertFileExists("app/build/distributions/app.js.map")
} }
build("clean", "browserDistribution") {
assertTasksExecuted(
":app:processResources",
":app:browserDistribution"
)
assertFileExists("app/build/distributions/index.html")
}
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/src/main/resources/index.html
+10
View File
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
<script src="app.js"></script>
</body>
</html>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+5 -1
View File
@@ -153,11 +153,15 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
val baseDist = project.buildDir.resolve(basePluginConvention!!.distsDirName) val baseDist = project.buildDir.resolve(basePluginConvention!!.distsDirName)
distribution.directory = distribution.directory ?: baseDist distribution.directory = distribution.directory ?: baseDist
val processResourcesTask = target.project.tasks.getByName(compilation.processResourcesTaskName)
val distributionTask = project.registerTask<Copy>( val distributionTask = project.registerTask<Copy>(
disambiguateCamelCased( disambiguateCamelCased(
DISTRIBUTION_TASK_NAME DISTRIBUTION_TASK_NAME
) )
) { ) {
it.dependsOn(processResourcesTask)
it.from(compilation.output.resourcesDir) it.from(compilation.output.resourcesDir)
it.into(distribution.directory ?: baseDist) it.into(distribution.directory ?: baseDist)
} }
@@ -176,7 +180,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
) { ) {
it.dependsOn( it.dependsOn(
nodeJs.npmInstallTask, nodeJs.npmInstallTask,
target.project.tasks.getByName(compilation.processResourcesTaskName), processResourcesTask,
distributionTask distributionTask
) )