Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import com.jetbrains.plugin.structure.base.utils.isFile
import org.jetbrains.changelog.markdownToHTML
import org.jetbrains.intellij.platform.gradle.Constants
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
import kotlin.io.path.absolute
import kotlin.io.path.isDirectory

Expand Down Expand Up @@ -69,11 +70,15 @@ sourceSets {
}

tasks.compileKotlin {
kotlinOptions { jvmTarget = "21" }
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
}
}

tasks.compileTestKotlin {
kotlinOptions { jvmTarget = "21" }
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
}
}

tasks.test {
Expand Down Expand Up @@ -178,7 +183,7 @@ dependencies {
intellijPlatform {
pluginVerification {
ides {
recommended()
create(IntelliJPlatformType.Rider, ProductVersion)
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RiderPluginId=com.jetbrains.rider.plugins.dotnetdisassembler
PluginRepositoryUrl=https://github.com/JetBrains/dotnet-disassembler-plugin
PluginVersion=0.1.1

pluginSinceBuild=253
pluginSinceBuild=261

BuildConfiguration=Debug

Expand All @@ -18,10 +18,10 @@ BuildConfiguration=Debug
# Release: 2020.2
# EAP: 2020.3-EAP2-SNAPSHOT
# Nightly: 2020.3-SNAPSHOT
ProductVersion=2025.3
ProductVersion=2026.1-SNAPSHOT

# Plugin Verification IDE Version
pluginVerificationIdeVersion=2025.3
pluginVerificationIdeVersion=2026.1-SNAPSHOT

# Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
# https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
kotlin = "2.1.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
kotlin = "2.3.0" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
rdGen = "2025.3.1" # https://github.com/JetBrains/rd/releases
changelog = "2.5.0" # https://github.com/JetBrains/gradle-changelog-plugin/releases

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ private static string GetDotNetCliExePath(ISolution solution)
var protocolSolution = solution.GetProtocolSolution();
var runtimeModel = protocolSolution.GetDotNetActiveRuntimeModel();
var activeRuntime = runtimeModel.ActiveRuntime.Maybe.ValueOrDefault;
return activeRuntime?.DotNetCliExePath;
return activeRuntime?.DotNetCliExePath?.Value ?? "dotnet";
}
}