[Gradle, JS] Use multiple arguments for ignoring
This commit is contained in:
+18
-1
@@ -181,7 +181,11 @@ internal class CacheBuilder(
|
|||||||
val compilerArgs = compilerArgsFactory()
|
val compilerArgs = compilerArgsFactory()
|
||||||
kotlinOptions.copyFreeCompilerArgsToArgs(compilerArgs)
|
kotlinOptions.copyFreeCompilerArgsToArgs(compilerArgs)
|
||||||
compilerArgs.freeArgs = compilerArgs.freeArgs
|
compilerArgs.freeArgs = compilerArgs.freeArgs
|
||||||
.filterNot { it.startsWith(ENTRY_IR_MODULE) }
|
.filterNot { arg ->
|
||||||
|
IGNORED_ARGS.any {
|
||||||
|
arg.startsWith(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
compilerArgs.includes = library.file.normalize().absolutePath
|
compilerArgs.includes = library.file.normalize().absolutePath
|
||||||
compilerArgs.outputFile = cacheDirectory.resolve("${library.name}.js").normalize().absolutePath
|
compilerArgs.outputFile = cacheDirectory.resolve("${library.name}.js").normalize().absolutePath
|
||||||
@@ -189,6 +193,9 @@ internal class CacheBuilder(
|
|||||||
compilerArgs.freeArgs += "-Xcache-directory=${it.absolutePath}"
|
compilerArgs.freeArgs += "-Xcache-directory=${it.absolutePath}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Change it for produce caches
|
||||||
|
compilerArgs.irProduceJs = true
|
||||||
|
|
||||||
compilerArgs.libraries = getAllDependencies(dependency)
|
compilerArgs.libraries = getAllDependencies(dependency)
|
||||||
.flatMap { it.moduleArtifacts }
|
.flatMap { it.moduleArtifacts }
|
||||||
.map { it.file }
|
.map { it.file }
|
||||||
@@ -215,4 +222,14 @@ internal class CacheBuilder(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val IGNORED_ARGS = listOf(
|
||||||
|
ENTRY_IR_MODULE,
|
||||||
|
PRODUCE_JS,
|
||||||
|
PRODUCE_UNZIPPED_KLIB,
|
||||||
|
ENABLE_DCE,
|
||||||
|
GENERATE_D_TS
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user