From f3dfb38163226489536d72fd018367de211ea11c Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 14 Jan 2021 16:25:36 +0300 Subject: [PATCH] [Gradle, JS] Exclude transitive dependencies of semver4j ^KT-44204 fixed --- libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 4 +++- .../jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt | 2 +- .../org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersions.kt | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 6be5e333150..ee19fadd8d2 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -57,7 +57,9 @@ dependencies { compile("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}") compile("de.undercouch:gradle-download-task:4.0.2") - implementation("com.github.gundy:semver4j:0.16.4") + implementation("com.github.gundy:semver4j:0.16.4:nodeps") { + exclude(group = "*") + } compileOnly("com.android.tools.build:gradle:2.0.0") compileOnly("com.android.tools.build:gradle-core:2.0.0") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt index 6035953d2b0..d9ef870d683 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.gradle.targets.js.npm +import com.github.gundy.hidden.antlr.v4.runtime.tree.TerminalNode import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionBaseVisitor import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionParser import com.github.gundy.semver4j.model.Version -import org.antlr.v4.runtime.tree.TerminalNode import org.jetbrains.kotlin.gradle.utils.toSetOrEmpty class NpmRangeVisitor : NodeSemverExpressionBaseVisitor>() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersions.kt index 2424f3b4782..464a37bf4eb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersions.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.gradle.targets.js.npm +import com.github.gundy.hidden.antlr.v4.runtime.ANTLRInputStream +import com.github.gundy.hidden.antlr.v4.runtime.CommonTokenStream import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionLexer import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionParser -import org.antlr.v4.runtime.ANTLRInputStream -import org.antlr.v4.runtime.CommonTokenStream import org.gradle.api.InvalidUserDataException fun versionToNpmRanges(version: String): Set {