Skip to content

Commit 3b9e645

Browse files
committed
Fix Rider build
1 parent 69a4a04 commit 3b9e645

3 files changed

Lines changed: 19 additions & 10 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
with:
2020
submodules: true
2121

22+
- uses: actions/setup-java@v5
23+
with:
24+
distribution: temurin
25+
java-version: 25
26+
2227
# - uses: actions/cache@v4
2328
# with:
2429
# path: ~/.nuget/packages

Src/RiderPlugin/build.gradle.kts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
id("java")
33
alias(libs.plugins.kotlinJvm)
4-
id("org.jetbrains.intellij.platform") version "2.16.0" // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
5-
id("me.filippov.gradle.jvm.wrapper") version "0.16.0" // https://plugins.gradle.org/plugin/me.filippov.gradle.jvm.wrapper
4+
id("org.jetbrains.intellij.platform") version "2.18.1" // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
5+
id("me.filippov.gradle.jvm.wrapper") version "0.15.0" // https://plugins.gradle.org/plugin/me.filippov.gradle.jvm.wrapper
66
}
77

88
val ResharperPluginProjectName: String by project
@@ -23,12 +23,6 @@ repositories {
2323
}
2424
}
2525

26-
tasks.wrapper {
27-
gradleVersion = "8.8"
28-
distributionType = Wrapper.DistributionType.ALL
29-
distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
30-
}
31-
3226
version = extra["PluginVersion"] as String
3327

3428
tasks.processResources {
@@ -49,9 +43,19 @@ dependencies {
4943
useInstaller = false
5044
}
5145
jetbrainsRuntime()
46+
47+
// Required for SimpleOptionsPage and other Rider frontend/.NET bridge APIs (split out in 2026.2):
48+
bundledModule("intellij.rider.rdclient.dotnet")
49+
50+
// Required for com.jetbrains.rdclient.actions.base.* (Frontend/BackendActionTrait), supertypes of RiderUnitTestAnActionBase (split out in 2026.2):
51+
bundledModule("intellij.rd.client")
5252
}
5353
}
5454

55+
intellijPlatform {
56+
buildSearchableOptions = false
57+
}
58+
5559
tasks.runIde {
5660
// Match Rider's default heap size of 1.5Gb (default for runIde is 512Mb)
5761
maxHeapSize = "1500m"

Src/RiderPlugin/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
kotlin = "2.3.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
3-
# rdGen = "2026.1.3" # https://github.com/JetBrains/rd/releases
2+
kotlin = "2.4.0" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
3+
# rdGen = "2026.2.5" # https://github.com/JetBrains/rd/releases
44

55
[libraries]
66
kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }

0 commit comments

Comments
 (0)