Skip to content

Commit d6e9eea

Browse files
authored
Upgrade Gradle IntelliJ Plugin to 1.3.0 (#2964)
1 parent 4538c8f commit d6e9eea

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
id("base")
1010
id("toolkit-changelog")
1111
id("toolkit-jacoco-report")
12-
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.1"
12+
id("org.jetbrains.gradle.plugin.idea-ext")
1313
}
1414

1515
val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL").forUseAtConfigurationTime()

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.c
44
awsSdk = "2.17.76"
55
commonmark = "0.17.1"
66
detekt = "1.18.1"
7-
intellijGradle = "1.2.1"
7+
intellijGradle = "1.3.0"
88
intellijRemoteRobot = "0.11.4"
99
jackson = "2.11.1"
1010
jacoco = "0.8.7"

jetbrains-rider/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ configure<RdGenExtension> {
8888
hashFolder = rdgenDir.toString()
8989

9090
classpath({
91-
val ijDependency = intellij.getIdeaDependency(project)
91+
val ijDependency = tasks.setupDependencies.flatMap { it.idea }.map { it.classes }.get()
9292
println("Calculating classpath for rdgen, intellij.ideaDependency is: $ijDependency")
93-
File(ijDependency.classes, "lib/rd").resolve("rider-model.jar").absolutePath
93+
File(ijDependency, "lib/rd").resolve("rider-model.jar").absolutePath
9494
})
9595

9696
sources(projectDir.resolve("protocol/model"))
@@ -157,6 +157,8 @@ val prepareBuildProps = tasks.register("prepareBuildProps") {
157157
val prepareNuGetConfig = tasks.register("prepareNuGetConfig") {
158158
group = backendGroup
159159

160+
dependsOn(tasks.setupDependencies)
161+
160162
val nugetConfigPath = File(projectDir, "NuGet.Config")
161163
// FIX_WHEN_MIN_IS_211 remove the projectDir one above
162164
val nugetConfigPath211 = Path.of(projectDir.absolutePath, "testData", "NuGet.config").toFile()
@@ -199,7 +201,7 @@ val buildReSharperPlugin = tasks.register("buildReSharperPlugin") {
199201
}
200202

201203
fun getNugetPackagesPath(): File {
202-
val sdkPath = intellij.getIdeaDependency(project).classes
204+
val sdkPath = tasks.setupDependencies.flatMap { it.idea }.map { it.classes }.get()
203205
println("SDK path: $sdkPath")
204206

205207
val riderSdk = File(sdkPath, "lib/DotNetSdkForRdPlugins")

0 commit comments

Comments
 (0)