diff --git a/build.gradle.kts b/build.gradle.kts index 636c51d..3914131 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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" } @@ -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") diff --git a/gradle.properties b/gradle.properties index 3dd811c..78e6d87 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.3 +PluginVersion=1.2.1-2026.1 BuildConfiguration=Debug @@ -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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e663fd2..eae5b2c 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.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] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6def616..fb49328 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.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 diff --git a/libs/verifier-cli-1.398-all.jar b/libs/verifier-cli-1.401-all.jar similarity index 92% rename from libs/verifier-cli-1.398-all.jar rename to libs/verifier-cli-1.401-all.jar index a0ba3dc..2f0cfc8 100644 Binary files a/libs/verifier-cli-1.398-all.jar and b/libs/verifier-cli-1.401-all.jar differ diff --git a/src/dotnet/Plugin.props b/src/dotnet/Plugin.props index ed8b86e..b60e4d2 100644 --- a/src/dotnet/Plugin.props +++ b/src/dotnet/Plugin.props @@ -3,7 +3,7 @@ - 2025.3.0 + 2026.1.0 OData CLI UI Description diff --git a/src/rider/main/kotlin/ru/ellizio/odatacliui/extensions/AnActionEventEx.kt b/src/rider/main/kotlin/ru/ellizio/odatacliui/extensions/AnActionEventEx.kt index 99341c1..21b4099 100644 --- a/src/rider/main/kotlin/ru/ellizio/odatacliui/extensions/AnActionEventEx.kt +++ b/src/rider/main/kotlin/ru/ellizio/odatacliui/extensions/AnActionEventEx.kt @@ -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) } \ No newline at end of file diff --git a/src/rider/main/kotlin/ru/ellizio/odatacliui/models/CliDialogModel.kt b/src/rider/main/kotlin/ru/ellizio/odatacliui/models/CliDialogModel.kt index 7fb843c..d0fdaf9 100644 --- a/src/rider/main/kotlin/ru/ellizio/odatacliui/models/CliDialogModel.kt +++ b/src/rider/main/kotlin/ru/ellizio/odatacliui/models/CliDialogModel.kt @@ -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 } diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml index b5bbf49..126681c 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