diff --git a/.github/workflows/prepare-build-environment/action.yml b/.github/workflows/prepare-build-environment/action.yml index e938dd7..3078dd3 100644 --- a/.github/workflows/prepare-build-environment/action.yml +++ b/.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: diff --git a/build.gradle.kts b/build.gradle.kts index 7336df1..636c51d 100644 --- a/build.gradle.kts +++ b/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).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 +} diff --git a/gradle.properties b/gradle.properties index a418b82..3dd811c 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 985511d..e663fd2 100644 --- a/gradle/libs.versions.toml +++ b/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] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7776c6b..6def616 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index f4fae37..2c82aa7 100755 --- a/gradlew +++ b/gradlew @@ -122,30 +122,30 @@ JVM_TEMP_FILE=$BUILD_DIR/gradle-jvm-temp.tar.gz if [ "$darwin" = "true" ]; then case $JVM_ARCH in x86_64) - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_macos-x64_bin.tar.gz - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_macos-x64_bin-1bcf03 + JVM_URL=https://download.oracle.com/java/21/archive/jdk-21.0.9_macos-x64_bin.tar.gz + JVM_TARGET_DIR=$BUILD_DIR/jdk-21.0.9_macos-x64_bin-1bcf04 ;; arm64) - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_macos-aarch64_bin.tar.gz - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_macos-aarch64_bin-297fa2 + JVM_URL=https://download.oracle.com/java/21/archive/jdk-21.0.9_macos-aarch64_bin.tar.gz + JVM_TARGET_DIR=$BUILD_DIR/jdk-21.0.9_macos-aarch64_bin-297fa3 ;; *) die "Unknown architecture $JVM_ARCH" ;; esac elif [ "$cygwin" = "true" ] || [ "$msys" = "true" ]; then - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_windows-x64_bin.zip - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_windows-x64_bin-d6ede5 + JVM_URL=https://download.oracle.com/java/21/archive/jdk-21.0.9_windows-x64_bin.zip + JVM_TARGET_DIR=$BUILD_DIR/jdk-21.0.9_windows-x64_bin-d6ede6 else JVM_ARCH=$(linux$(getconf LONG_BIT) uname -m) case $JVM_ARCH in x86_64) - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_linux-x64_bin.tar.gz - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_linux-x64_bin-9324ae + JVM_URL=https://download.oracle.com/java/21/archive/jdk-21.0.9_linux-x64_bin.tar.gz + JVM_TARGET_DIR=$BUILD_DIR/jdk-21.0.9_linux-x64_bin-9324af ;; aarch64) - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_linux-aarch64_bin.tar.gz - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_linux-aarch64_bin-319da6 + JVM_URL=https://download.oracle.com/java/21/archive/jdk-21.0.9_linux-aarch64_bin.tar.gz + JVM_TARGET_DIR=$BUILD_DIR/jdk-21.0.9_linux-aarch64_bin-319da7 ;; *) die "Unknown architecture $JVM_ARCH" diff --git a/gradlew.bat b/gradlew.bat index 8adb778..217941d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,9 +40,18 @@ set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" setlocal set BUILD_DIR=%LOCALAPPDATA%\gradle-jvm -set JVM_TARGET_DIR=%BUILD_DIR%\jdk-17.0.3.1_windows-x64_bin-d6ede5\ -set JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_windows-x64_bin.zip +for /f "tokens=3 delims= " %%A in ('reg query "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v "PROCESSOR_ARCHITECTURE"') do set WIN_ARCH=%%A +if "%WIN_ARCH%" equ "AMD64" ( + set JVM_URL=https://download.oracle.com/java/21/archive/jdk-21.0.9_windows-x64_bin.zip\ + set JVM_TARGET_DIR=%BUILD_DIR%\jdk-21.0.9_windows-x64_bin-020648 +) else if "%WIN_ARCH%" equ "ARM64" ( + set JVM_URL=https://aka.ms/download-jdk/microsoft-jdk-21.0.9-windows-aarch64.zip\ + set JVM_TARGET_DIR=%BUILD_DIR%\microsoft-jdk-21.0.9-windows-aarch64-351ba0 +) else ( + echo Unknown architecture %WIN_ARCH% + goto fail +) set IS_TAR_GZ=0 set JVM_TEMP_FILE=gradle-jvm.zip diff --git a/libs/marketplace-zip-signer-cli-0.1.42.jar b/libs/marketplace-zip-signer-cli-0.1.43.jar similarity index 81% rename from libs/marketplace-zip-signer-cli-0.1.42.jar rename to libs/marketplace-zip-signer-cli-0.1.43.jar index 780acd6..07e740b 100644 Binary files a/libs/marketplace-zip-signer-cli-0.1.42.jar and b/libs/marketplace-zip-signer-cli-0.1.43.jar differ diff --git a/libs/verifier-cli-1.394-all.jar b/libs/verifier-cli-1.398-all.jar similarity index 82% rename from libs/verifier-cli-1.394-all.jar rename to libs/verifier-cli-1.398-all.jar index a1cc60c..a0ba3dc 100644 Binary files a/libs/verifier-cli-1.394-all.jar and b/libs/verifier-cli-1.398-all.jar differ diff --git a/src/dotnet/Plugin.props b/src/dotnet/Plugin.props index 14cf8dd..ed8b86e 100644 --- a/src/dotnet/Plugin.props +++ b/src/dotnet/Plugin.props @@ -3,7 +3,7 @@ - 2025.2.0 + 2025.3.0 OData CLI UI Description diff --git a/src/dotnet/ReSharperPlugin.ODataCliUi/DotnetToolsTracker.cs b/src/dotnet/ReSharperPlugin.ODataCliUi/DotnetToolsTracker.cs index 23242a2..fdfb7d1 100644 --- a/src/dotnet/ReSharperPlugin.ODataCliUi/DotnetToolsTracker.cs +++ b/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); }); } } \ No newline at end of file diff --git a/src/dotnet/ReSharperPlugin.ODataCliUi/PluginHost.cs b/src/dotnet/ReSharperPlugin.ODataCliUi/PluginHost.cs index 39450b6..3457de9 100644 --- a/src/dotnet/ReSharperPlugin.ODataCliUi/PluginHost.cs +++ b/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() diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml index 8f62183..b5bbf49 100644 --- a/src/rider/main/resources/META-INF/plugin.xml +++ b/src/rider/main/resources/META-INF/plugin.xml @@ -3,7 +3,7 @@ OData CLI UI _PLACEHOLDER_ ellizio - + com.intellij.modules.rider org.jetbrains.plugins.terminal UiBundle