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

[Gradle, JS] Exclude transitive dependencies of semver4j

Browse Source 
^KT-44204 fixed
This commit is contained in:
Ilya Goncharov
2021-01-14 16:25:36 +03:00
parent e742af5444
commit f3dfb38163
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+3 -1
View File
@@ -57,7 +57,9 @@ dependencies {
compile("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}") compile("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
compile("de.undercouch:gradle-download-task:4.0.2") 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:2.0.0")
compileOnly("com.android.tools.build:gradle-core:2.0.0") compileOnly("com.android.tools.build:gradle-core:2.0.0")
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt
+1 -1
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.gradle.targets.js.npm 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.NodeSemverExpressionBaseVisitor
import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionParser import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionParser
import com.github.gundy.semver4j.model.Version import com.github.gundy.semver4j.model.Version
import org.antlr.v4.runtime.tree.TerminalNode
import org.jetbrains.kotlin.gradle.utils.toSetOrEmpty import org.jetbrains.kotlin.gradle.utils.toSetOrEmpty
class NpmRangeVisitor : NodeSemverExpressionBaseVisitor<Set<NpmRange>>() { class NpmRangeVisitor : NodeSemverExpressionBaseVisitor<Set<NpmRange>>() {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersions.kt
+2 -2
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.gradle.targets.js.npm 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.NodeSemverExpressionLexer
import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionParser 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 import org.gradle.api.InvalidUserDataException
fun versionToNpmRanges(version: String): Set<NpmRange> { fun versionToNpmRanges(version: String): Set<NpmRange> {