[Gradle, JS] Add fileTree for kotlin2jsCompile
This commit is contained in:
@@ -177,8 +177,8 @@ task compileJs(type: NoDebugJavaExec) {
|
|||||||
def compileKotlin2JsFiles = compileKotlin2Js.destinationDirectory
|
def compileKotlin2JsFiles = compileKotlin2Js.destinationDirectory
|
||||||
doFirst {
|
doFirst {
|
||||||
args = [jsOutputFileName, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() +
|
args = [jsOutputFileName, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() +
|
||||||
(compileBuiltinsKotlin2JsFiles.asFile.get().listFiles().sort() +
|
(compileBuiltinsKotlin2JsFiles.asFileTree.files.sort() +
|
||||||
compileKotlin2JsFiles.asFile.get().listFiles().sort()).findAll {
|
compileKotlin2JsFiles.asFileTree.files.sort()).findAll {
|
||||||
it.name.endsWith(".js") && !it.name.endsWith(".meta.js")
|
it.name.endsWith(".js") && !it.name.endsWith(".meta.js")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
@@ -75,6 +75,11 @@ abstract class KotlinJsIrLink @Inject constructor(
|
|||||||
@get:Input
|
@get:Input
|
||||||
val outputGranularity: KotlinJsIrOutputGranularity = propertiesProvider.jsIrOutputGranularity
|
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:Internal
|
||||||
@get:Deprecated("Please use modeProperty instead.")
|
@get:Deprecated("Please use modeProperty instead.")
|
||||||
var mode: KotlinJsBinaryMode
|
var mode: KotlinJsBinaryMode
|
||||||
|
|||||||
+1
-1
@@ -259,7 +259,7 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> @Inject constr
|
|||||||
|
|
||||||
// avoid creating directory in getter: this can lead to failure in parallel build
|
// avoid creating directory in getter: this can lead to failure in parallel build
|
||||||
@get:OutputDirectory
|
@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
|
// avoid creating directory in getter: this can lead to failure in parallel build
|
||||||
@get:LocalState
|
@get:LocalState
|
||||||
|
|||||||
Reference in New Issue
Block a user