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

Collect env variables to separate collector

Browse Source
This commit is contained in:
Ilya Goncharov
2019-09-05 17:28:41 +03:00
parent 613391d00b
commit 3bfb980a39
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+4 -1
View File
@@ -39,6 +39,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
private val requiredDependencies = mutableSetOf<NpmPackageVersion>() private val requiredDependencies = mutableSetOf<NpmPackageVersion>()
private val configurators = mutableListOf<(KotlinJsTest) -> Unit>() private val configurators = mutableListOf<(KotlinJsTest) -> Unit>()
private val envJsWriters = mutableListOf<(Appendable) -> Unit>()
private val confJsWriters = mutableListOf<(Appendable) -> Unit>() private val confJsWriters = mutableListOf<(Appendable) -> Unit>()
private var sourceMaps = false private var sourceMaps = false
private var configDirectory: File? = project.projectDir.resolve("karma.config.d").takeIf { it.isDirectory } private var configDirectory: File? = project.projectDir.resolve("karma.config.d").takeIf { it.isDirectory }
@@ -118,7 +119,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
private fun usePuppeteer(envVar: String) { private fun usePuppeteer(envVar: String) {
requiredDependencies.add(versions.puppeteer) requiredDependencies.add(versions.puppeteer)
confJsWriters.add { envJsWriters.add {
it.appendln() it.appendln()
//language=JavaScript 1.8 //language=JavaScript 1.8
it.appendln( it.appendln(
@@ -258,6 +259,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
val karmaConfJs = npmProject.dir.resolve("karma.conf.js") val karmaConfJs = npmProject.dir.resolve("karma.conf.js")
karmaConfJs.printWriter().use { confWriter -> karmaConfJs.printWriter().use { confWriter ->
envJsWriters.forEach { it(confWriter) }
confWriter.println()
confWriter.println("module.exports = function(config) {") confWriter.println("module.exports = function(config) {")
confWriter.println() confWriter.println()