Skip to content

Commit ca7e4e8

Browse files
committed
Slightly improve the gradle-tooling-extension dependency definition
1 parent 4a15264 commit ca7e4e8

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,18 @@ dependencies {
9393
"testLibs"("org.jetbrains.idea:mockJDK:1.7-4d76c50")
9494
"testLibs"("org.spongepowered:mixin:0.7-SNAPSHOT:thin")
9595

96-
// Better way to do this?
97-
if (!ideaVersion.endsWith("SNAPSHOT")) {
98-
afterEvaluate {
99-
// This needs to happen after build number is resolved
100-
// intellij.ideaDependency.buildNumber == intellij.type-<buildnumber>
101-
// gradle-tooling-extension isn't released with major intellij versions like intellij is
102-
// intellij.type is typically IC
103-
// build number is IC-number, so + 1 is needed to remove the -
104-
"gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:${intellij.ideaDependency.buildNumber.substring(intellij.type.length + 1)}")
96+
// This needs to happen after build number is resolved
97+
// intellij.ideaDependency.buildNumber == intellij.type-<buildnumber>
98+
// gradle-tooling-extension isn't released with major intellij versions like intellij is
99+
// intellij.type is typically IC
100+
// build number is IC-number, so + 1 is needed to remove the -
101+
afterEvaluate {
102+
val gradleVersion = if (!ideaVersion.endsWith("SNAPSHOT")) {
103+
intellij.ideaDependency.buildNumber.substring(intellij.type.length + 1)
104+
} else {
105+
ideaVersion
105106
}
106-
} else {
107-
"gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:$ideaVersion")
107+
"gradle-tooling-extension"("com.jetbrains.intellij.gradle:gradle-tooling-extension:$gradleVersion")
108108
}
109109
}
110110

0 commit comments

Comments
 (0)