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
9 changes: 4 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
}

tasks.wrapper {
gradleVersion = "8.8"
gradleVersion = "9.4.0"
distributionType = Wrapper.DistributionType.ALL
distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
}
Expand Down Expand Up @@ -78,15 +78,14 @@ tasks.compileKotlin {

intellijPlatform {
pluginVerification {
cliPath = File("/libs/verifier-cli-1.398-all.jar") // https://github.com/JetBrains/intellij-plugin-verifier
cliPath = File("./libs/verifier-cli-1.401-all.jar") // https://github.com/JetBrains/intellij-plugin-verifier/releases
ides {
create(IntelliJPlatformType.Rider, "2025.3")
create(IntelliJPlatformType.Rider, "2025.3.0.1")
create(IntelliJPlatformType.Rider, "2026.1")
}
}

signing {
cliPath = File("./libs/marketplace-zip-signer-cli-0.1.43.jar") // https://github.com/JetBrains/marketplace-zip-signer
cliPath = File("./libs/marketplace-zip-signer-cli-0.1.43.jar") // https://github.com/JetBrains/marketplace-zip-signer/releases
certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN")
privateKey = providers.environmentVariable("PRIVATE_KEY")
password = providers.environmentVariable("PRIVATE_KEY_PASSWORD")
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
DotnetPluginId=ReSharperPlugin.ODataCliUi
DotnetSolution=ReSharperPlugin.ODataCliUi.sln
RiderPluginId=ru.ellizio.odatacliui
PluginVersion=1.2.1-2025.3
PluginVersion=1.2.1-2026.1

BuildConfiguration=Debug

Expand All @@ -17,7 +17,7 @@ PublishToken="_PLACEHOLDER_"
# Release: 2020.2
# EAP: 2020.3-EAP2-SNAPSHOT
# Nightly: 2020.3-SNAPSHOT
ProductVersion=2025.3
ProductVersion=2026.1

# 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
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
kotlin = "2.1.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
rdGen = "2025.3.1" # https://github.com/JetBrains/rd/releases
intellijPlatform = "2.10.4" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
kotlin = "2.3.10" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library https://github.com/jetbrains/kotlin/releases
rdGen = "2026.1.3" # https://github.com/JetBrains/rd/releases
intellijPlatform = "2.13.1" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
gradleJvmWrapper = "0.15.0" # https://github.com/mfilippov/gradle-jvm-wrapper

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.13-all.zip
distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-9.4.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion src/dotnet/Plugin.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<!-- See https://www.nuget.org/packages/JetBrains.ReSharper.SDK -->
<!-- Keep in sync with ProductVersion in gradle.properties -->
<SdkVersion>2025.3.0</SdkVersion>
<SdkVersion>2026.1.0</SdkVersion>

<Title>OData CLI UI</Title>
<Description>Description</Description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fun AnActionEvent.toMetadata(): ActionMetadata? {
throw IllegalStateException("Selected item not supported")
}

val projectPath = (descriptor.location as RdCustomLocation).customLocation
val projectPath = (descriptor.location as RdCustomLocation).customLocation.value

return ActionMetadata(descriptor.name, projectPath)
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class CliDialogModel(project: Project, private val actionMetadata: ActionMetadat

init {
odataCliTool = project.solution.protocolModel.getODataCliTool.sync(Unit)
dotnetCliPath = project.solution.dotNetActiveRuntimeModel.activeRuntime.valueOrNull?.dotNetCliExePath
dotnetCliPath = project.solution.dotNetActiveRuntimeModel.activeRuntime.valueOrNull?.dotNetCliExePath?.value

atLeast031 = odataCliTool.version?.greaterOrEquals(0, 3, 1) ?: false
}
Expand Down
2 changes: 1 addition & 1 deletion src/rider/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>OData CLI UI</name>
<version>_PLACEHOLDER_</version>
<vendor url="https://github.com/ellizio/odata-cli-ui">ellizio</vendor>
<idea-version since-build="253" until-build="253.*" />
<idea-version since-build="261" until-build="261.*" />
<depends>com.intellij.modules.rider</depends>
<depends>org.jetbrains.plugins.terminal</depends>
<resource-bundle>UiBundle</resource-bundle>
Expand Down
Loading