[Gradle, JS] Add fileTree for kotlin2jsCompile

This commit is contained in:
Ilya Goncharov
2022-08-31 13:59:28 +02:00
committed by teamcity
parent 0bcb823550
commit 0efb8a64bf
3 changed files with 8 additions and 3 deletions
+2 -2
View File
@@ -177,8 +177,8 @@ task compileJs(type: NoDebugJavaExec) {
def compileKotlin2JsFiles = compileKotlin2Js.destinationDirectory
doFirst {
args = [jsOutputFileName, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() +
(compileBuiltinsKotlin2JsFiles.asFile.get().listFiles().sort() +
compileKotlin2JsFiles.asFile.get().listFiles().sort()).findAll {
(compileBuiltinsKotlin2JsFiles.asFileTree.files.sort() +
compileKotlin2JsFiles.asFileTree.files.sort()).findAll {
it.name.endsWith(".js") && !it.name.endsWith(".meta.js")
}
}
@@ -75,6 +75,11 @@ abstract class KotlinJsIrLink @Inject constructor(
@get:Input
val outputGranularity: KotlinJsIrOutputGranularity = propertiesProvider.jsIrOutputGranularity
// Incremental stuff of link task is inside compiler
@get:Internal
override val taskBuildCacheableOutputDirectory: DirectoryProperty
get() = super.taskBuildCacheableOutputDirectory
@get:Internal
@get:Deprecated("Please use modeProperty instead.")
var mode: KotlinJsBinaryMode
@@ -259,7 +259,7 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> @Inject constr
// avoid creating directory in getter: this can lead to failure in parallel build
@get:OutputDirectory
internal val taskBuildCacheableOutputDirectory: DirectoryProperty = objectFactory.directoryProperty()
internal open val taskBuildCacheableOutputDirectory: DirectoryProperty = objectFactory.directoryProperty()
// avoid creating directory in getter: this can lead to failure in parallel build
@get:LocalState