From 5763acbd31d3ecba263893db22d340453b24dcb1 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 24 Apr 2023 11:39:06 +0000 Subject: [PATCH] [Gradle, JS] Remove useCoverage fun ^KT-58199 fixed --- .../gradle/targets/js/NpmPackages.kt | 1 - .../kotlin/gradle/targets/js/NpmVersions.kt | 1 - .../targets/js/testing/karma/KarmaConfig.kt | 6 --- .../targets/js/testing/karma/KotlinKarma.kt | 38 ------------------- 4 files changed, 46 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/NpmPackages.kt b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/NpmPackages.kt index 676d0f03f85..347293864e1 100644 --- a/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/NpmPackages.kt +++ b/libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/NpmPackages.kt @@ -27,7 +27,6 @@ val npmPackages = listOf( NpmPackage("karma-safari-launcher"), NpmPackage("karma-mocha"), NpmPackage("karma-webpack"), - NpmPackage("karma-coverage"), NpmPackage("karma-sourcemap-loader"), NpmPackage("typescript"), ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index e7fa0e9b7a9..1a6df1b22fe 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -33,7 +33,6 @@ class NpmVersions : Serializable { val karmaSafariLauncher = NpmPackageVersion("karma-safari-launcher", "1.0.0") val karmaMocha = NpmPackageVersion("karma-mocha", "2.0.1") val karmaWebpack = NpmPackageVersion("karma-webpack", "5.0.0") - val karmaCoverage = NpmPackageVersion("karma-coverage", "2.2.0") val karmaSourcemapLoader = NpmPackageVersion("karma-sourcemap-loader", "0.4.0") val typescript = NpmPackageVersion("typescript", "4.9.5") diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt index 7a39f7bc686..66b8f76c3e0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt @@ -23,7 +23,6 @@ data class KarmaConfig( val failOnEmptyTestSuite: Boolean = false, val reporters: MutableList = mutableListOf(), val preprocessors: MutableMap> = mutableMapOf(), - var coverageReporter: CoverageReporter? = null, val proxies: MutableMap = mutableMapOf() ) @@ -43,11 +42,6 @@ class CustomLauncher(var base: String) { var debug: Boolean? = null } -data class CoverageReporter( - var dir: String, - val reporters: MutableList = mutableListOf() -) - data class Reporter( val type: String, val subDir: String? = null, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index ebe2e4c1511..641c134925d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -304,44 +304,6 @@ class KotlinKarma( } } - fun useCoverage( - html: Boolean = true, - lcov: Boolean = true, - cobertura: Boolean = false, - teamcity: Boolean = true, - text: Boolean = false, - textSummary: Boolean = false, - json: Boolean = false, - jsonSummary: Boolean = false - ) { - if (listOf( - html, lcov, cobertura, - teamcity, text, textSummary, - json, jsonSummary - ).all { !it } - ) return - - requiredDependencies.add(versions.karmaCoverage) - config.reporters.add("coverage") - addPreprocessor("coverage") { !it.endsWith("_test.js") } - - configurators.add { - val reportDir = project.reportsDir.resolve("coverage/${it.name}") - reportDir.mkdirs() - - config.coverageReporter = CoverageReporter(reportDir.canonicalPath).also { coverage -> - if (html) coverage.reporters.add(Reporter("html")) - if (lcov) coverage.reporters.add(Reporter("lcovonly")) - if (cobertura) coverage.reporters.add(Reporter("cobertura")) - if (teamcity) coverage.reporters.add(Reporter("teamcity")) - if (text) coverage.reporters.add(Reporter("text")) - if (textSummary) coverage.reporters.add(Reporter("text-summary")) - if (json) coverage.reporters.add(Reporter("json")) - if (jsonSummary) coverage.reporters.add(Reporter("json-summary")) - } - } - } - fun useSourceMapSupport() { requiredDependencies.add(versions.karmaSourcemapLoader) sourceMaps = true