From 60b1475c7c19e20785f55c33ba6270a1286ec176 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 5 Apr 2018 12:27:08 +0300 Subject: [PATCH] Gradle: PasteMvnDependencyPreProcessor can be reused for kotlin DSL --- .../gradle/action/PasteMvnDependencyPreProcessor.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/PasteMvnDependencyPreProcessor.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/PasteMvnDependencyPreProcessor.java index dc7157a50ca5..23af62e00f75 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/PasteMvnDependencyPreProcessor.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/PasteMvnDependencyPreProcessor.java @@ -61,7 +61,8 @@ public class PasteMvnDependencyPreProcessor implements CopyPastePreProcessor { @NotNull String artifactId, @NotNull String version, @NotNull String scope, - @NotNull String gradleClassifier) { + @NotNull String classifier) { + String gradleClassifier = classifier.isEmpty() ? "" : ":" + classifier; return scope + "'" + groupId + ":" + artifactId + ":" + version + gradleClassifier + "'"; } @@ -96,9 +97,7 @@ public class PasteMvnDependencyPreProcessor implements CopyPastePreProcessor { if (groupId.isEmpty() || artifactId.isEmpty() || version.isEmpty()) { return null; } - String gradleClassifier = classifier.isEmpty() ? "" : ":" + classifier; - - return formatGradleDependency(groupId, artifactId, version, scope, gradleClassifier); + return formatGradleDependency(groupId, artifactId, version, scope, classifier); } @NotNull