Bump to 2025.3

.github/workflows/prepare-build-environment/action.yml

@@ -3,6 +3,13 @@ description: "Prepare build environment"
 runs:
   using: "composite"
   steps:
+    - name: Clear disk space
+      uses: insightsengineering/disk-space-reclaimer@v1
+      with:
+        tools-cache: false
+        dotnet: false
+        large-packages: false
+
     - name: Setup JDK
       uses: actions/setup-java@v4
       with:

build.gradle.kts

@@ -2,6 +2,7 @@ import com.jetbrains.plugin.structure.base.utils.isFile
 import groovy.ant.FileNameFinder
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.jetbrains.intellij.platform.gradle.Constants
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.ByteArrayOutputStream
 
@@ -39,7 +40,7 @@ repositories {
 
 dependencies {
     intellijPlatform {
-        rider(ProductVersion, useInstaller = false)
+        rider(ProductVersion) { useInstaller = false }
         jetbrainsRuntime()
 
         // TODO: add plugins
@@ -77,16 +78,15 @@ tasks.compileKotlin {
 
 intellijPlatform {
     pluginVerification {
-        cliPath = File("/libs/verifier-cli-1.394-all.jar") // https://github.com/JetBrains/intellij-plugin-verifier
+        cliPath = File("/libs/verifier-cli-1.398-all.jar") // https://github.com/JetBrains/intellij-plugin-verifier
         ides {
-            ides(listOf(
-                "RD-2025.2"
-            ))
+            create(IntelliJPlatformType.Rider, "2025.3")
+            create(IntelliJPlatformType.Rider, "2025.3.0.1")
         }
     }
 
     signing {
-        cliPath = File("./libs/marketplace-zip-signer-cli-0.1.42.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
         certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN")
         privateKey = providers.environmentVariable("PRIVATE_KEY")
         password = providers.environmentVariable("PRIVATE_KEY_PASSWORD")
@@ -100,7 +100,7 @@ val setBuildTool by tasks.registering {
 
         if (isWindows) {
             val stdout = ByteArrayOutputStream()
-            exec {
+            objects.newInstance(ExecOperationsProvider::class).execOperations.exec {
                 executable("${rootDir}\\tools\\vswhere.exe")
                 args("-latest", "-property", "installationPath", "-products", "*")
                 standardOutput = stdout
@@ -128,7 +128,7 @@ val compileDotNet by tasks.registering {
         val executable: String by setBuildTool.get().extra
         val arguments = (setBuildTool.get().extra["args"] as List<String>).toMutableList()
         arguments.add("/t:Restore;Rebuild")
-        exec {
+        objects.newInstance(ExecOperationsProvider::class).execOperations.exec {
             executable(executable)
             args(arguments)
             workingDir(rootDir)
@@ -138,7 +138,7 @@ val compileDotNet by tasks.registering {
 
 val testDotNet by tasks.registering {
     doLast {
-        exec {
+        objects.newInstance(ExecOperationsProvider::class).execOperations.exec {
             executable("dotnet")
             args("test", DotnetSolution,"--logger","GitHubActions")
             workingDir(rootDir)
@@ -166,7 +166,7 @@ tasks.buildPlugin {
         arguments.add("/p:PackageOutputPath=${rootDir}/output")
         arguments.add("/p:PackageReleaseNotes=${changeNotes}")
         arguments.add("/p:PackageVersion=${version}")
-        exec {
+        objects.newInstance(ExecOperationsProvider::class).execOperations.exec {
             executable(executable)
             args(arguments)
             workingDir(rootDir)
@@ -218,7 +218,7 @@ tasks.publishPlugin {
     token.set(PublishToken)
 
     doLast {
-        exec {
+        objects.newInstance(ExecOperationsProvider::class).execOperations.exec {
             executable("dotnet")
             args("nuget", "push", "output/${DotnetPluginId}.${version}.nupkg", "--api-key", PublishToken, "--source", "https://plugins.jetbrains.com")
             workingDir(rootDir)
@@ -243,3 +243,8 @@ artifacts {
         builtBy(Constants.Tasks.INITIALIZE_INTELLIJ_PLATFORM_PLUGIN)
     }
 }
+
+interface ExecOperationsProvider {
+    @get:Inject
+    val execOperations: ExecOperations
+}

gradle.properties

@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.ODataCliUi
 DotnetSolution=ReSharperPlugin.ODataCliUi.sln
 RiderPluginId=ru.ellizio.odatacliui
-PluginVersion=1.2.1-2025.2
+PluginVersion=1.2.1-2025.3
 
 BuildConfiguration=Debug
 
@@ -17,7 +17,7 @@ PublishToken="_PLACEHOLDER_"
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-ProductVersion=2025.2
+ProductVersion=2025.3
 
 # 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

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 kotlin = "2.1.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
-rdGen = "2025.2.2" # https://github.com/JetBrains/rd/releases
-intellijPlatform = "2.6.0" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+rdGen = "2025.3.1" # https://github.com/JetBrains/rd/releases
+intellijPlatform = "2.10.4" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
 gradleJvmWrapper = "0.15.0" # https://github.com/mfilippov/gradle-jvm-wrapper
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/dotnet/Plugin.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- See https://www.nuget.org/packages/JetBrains.ReSharper.SDK -->
     <!-- Keep in sync with ProductVersion in gradle.properties -->
-    <SdkVersion>2025.2.0</SdkVersion>
+    <SdkVersion>2025.3.0</SdkVersion>
 
     <Title>OData CLI UI</Title>
     <Description>Description</Description>

src/dotnet/ReSharperPlugin.ODataCliUi/DotnetToolsTracker.cs

@@ -30,8 +30,7 @@ public void Start()
                 return;
 
             using var _ = _lock.UsingWriteLock();
-            var cache = args.New;
-            DotnetToolsCacheChanged?.Invoke(cache);
+            DotnetToolsCacheChanged?.Invoke(args.New);
         });
     }
 }

src/dotnet/ReSharperPlugin.ODataCliUi/PluginHost.cs

@@ -54,8 +54,8 @@ private void OnDotnetToolsCacheChanged(DotNetToolCache cache)
     {
         var tool = cache.ToolGlobalCache.GetGlobalTool(Constants.MicrosoftODataCliPackageId)?.FirstOrDefault();
         _odataCliTool = tool is null
-            ? _odataCliTool = new DotnetToolDefinition(false, null)
-            : _odataCliTool = new DotnetToolDefinition(true, new DotnetToolVersionDefinition(tool.Version.Major, tool.Version.Minor, tool.Version.Patch));
+            ? new DotnetToolDefinition(false, null)
+            : new DotnetToolDefinition(true, new DotnetToolVersionDefinition(tool.Version.Major, tool.Version.Minor, tool.Version.Patch));
     }
 
     public void Dispose()

src/rider/main/resources/META-INF/plugin.xml

@@ -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="252" until-build="252.*" />
+  <idea-version since-build="253" until-build="253.*" />
   <depends>com.intellij.modules.rider</depends>
   <depends>org.jetbrains.plugins.terminal</depends>
   <resource-bundle>UiBundle</resource-bundle>