From 5ce3132f9f0f108fb5d414e16fa72fcc283b514b Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 20 Mar 2023 18:10:12 +0100 Subject: [PATCH] [Gradle, JS] No format-util in gradle plugin dependencies --- .../jetbrains/kotlin/generators/gradle/targets/js/NpmPackages.kt | 1 - .../kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt | 1 - .../kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt | 1 - .../kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt | 1 - .../kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt | 1 - 5 files changed, 5 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 0c859a38381..676d0f03f85 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 @@ -29,7 +29,6 @@ val npmPackages = listOf( NpmPackage("karma-webpack"), NpmPackage("karma-coverage"), NpmPackage("karma-sourcemap-loader"), - NpmPackage("format-util"), 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 7e0cd34d5c5..e7fa0e9b7a9 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 @@ -35,7 +35,6 @@ class NpmVersions : Serializable { 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 formatUtil = NpmPackageVersion("format-util", "1.0.5") val typescript = NpmPackageVersion("typescript", "4.9.5") val kotlinJsTestRunner = KotlinGradleNpmPackage("test-js-runner") 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 61cd835f065..18807952284 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 @@ -266,7 +266,6 @@ class KotlinKarma( requiredDependencies.add( versions.webpackCli ) - requiredDependencies.add(versions.formatUtil) requiredDependencies.add( versions.sourceMapLoader ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt index 437c8a2b459..2ff10b18635 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt @@ -36,7 +36,6 @@ class KotlinMocha(@Transient override val compilation: KotlinJsCompilation, priv get() = setOf( versions.mocha, versions.sourceMapSupport, - versions.formatUtil ) override fun getPath() = "$basePath:kotlinMocha" diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt index 42786e6e77d..91efa050a4f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackConfig.kt @@ -98,7 +98,6 @@ data class KotlinWebpackConfig( it.add( versions.webpackCli ) - it.add(versions.formatUtil) if (sourceMaps) { it.add(