From 16e187818fd9c9856554503ab646df553c450866 Mon Sep 17 00:00:00 2001
From: ellizio <profillive@mail.ru>
Date: Thu, 15 Aug 2024 10:50:50 +0300
Subject: [PATCH 1/2] bump to 1.2.0

---
 build.gradle                                       | 14 ++++++++------
 gradle.properties                                  |  4 ++--
 src/dotnet/Plugin.props                            |  2 +-
 .../ReSharperPlugin.ODataCliUi.Rider.csproj        |  2 +-
 .../odatacliui/actions/OpenCliDialogAction.kt      |  3 ---
 src/rider/main/resources/META-INF/plugin.xml       |  2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 528dfeb..6f01eb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.8.10'
     id 'org.jetbrains.intellij' version '1.13.3'     // See https://github.com/JetBrains/gradle-intellij-plugin/releases
-    id 'com.jetbrains.rdgen' version '2023.3.2'      // See https://github.com/JetBrains/rd/releases
+    id 'com.jetbrains.rdgen' version '2024.1.1'      // See https://github.com/JetBrains/rd/releases
     id 'me.filippov.gradle.jvm.wrapper' version '0.14.0'
 }
 
@@ -209,11 +209,13 @@ prepareSandbox {
 
 runPluginVerifier {
     ideVersions = [
-            "RD-2023.3",
-            "RD-2023.3.1",
-            "RD-2023.3.2",
-            "RD-2023.3.3",
-            "RD-2023.3.4"
+            "RD-2024.1",
+            "RD-2024.1.1",
+            "RD-2024.1.2",
+            "RD-2024.1.3",
+            "RD-2024.1.4",
+            "RD-2024.1.5",
+            "RD-2024.1.6"
     ]
 }
 
diff --git a/gradle.properties b/gradle.properties
index e44b451..ef3cea1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.ODataCliUi
 DotnetSolution=ReSharperPlugin.ODataCliUi.sln
 RiderPluginId=ru.ellizio.odatacliui
-PluginVersion=1.1.0
+PluginVersion=1.2.0
 
 BuildConfiguration=Debug
 
@@ -17,7 +17,7 @@ PublishToken="_PLACEHOLDER_"
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-ProductVersion=2023.3
+ProductVersion=2024.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/src/dotnet/Plugin.props b/src/dotnet/Plugin.props
index bced717..133ef71 100644
--- a/src/dotnet/Plugin.props
+++ b/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>2023.3.0</SdkVersion>
+    <SdkVersion>2024.1.0</SdkVersion>
 
     <Title>OData CLI UI</Title>
     <Description>Description</Description>
diff --git a/src/dotnet/ReSharperPlugin.ODataCliUi/ReSharperPlugin.ODataCliUi.Rider.csproj b/src/dotnet/ReSharperPlugin.ODataCliUi/ReSharperPlugin.ODataCliUi.Rider.csproj
index f16d427..58f0290 100644
--- a/src/dotnet/ReSharperPlugin.ODataCliUi/ReSharperPlugin.ODataCliUi.Rider.csproj
+++ b/src/dotnet/ReSharperPlugin.ODataCliUi/ReSharperPlugin.ODataCliUi.Rider.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Rider.SDK" Version="$(SdkVersion)" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.3" />
   </ItemGroup>
diff --git a/src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt b/src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt
index dcb7336..2470caa 100644
--- a/src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt
+++ b/src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt
@@ -30,9 +30,6 @@ class OpenCliDialogAction : AnAction() {
 
         val dialogModel = CliDialogModel(project, actionMetadata)
 
-        // launchOnUi is available since 233.11799.241
-        // RD-2023.3 has build number 233.11799.261
-        @Suppress("MissingRecentApi")
         project.lifetime.launchOnUi {
             val dialog = CliDialog(dialogModel)
             if (dialog.showAndGet()) {
diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml
index 9806712..6455d35 100644
--- a/src/rider/main/resources/META-INF/plugin.xml
+++ b/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="_PLACEHOLDER_" until-build="_PLACEHOLDER_" />
+  <idea-version since-build="241" until-build="241.*" />
   <depends>com.intellij.modules.rider</depends>
   <depends>org.jetbrains.plugins.terminal</depends>
   <resource-bundle>UiBundle</resource-bundle>

From a226fc24359d11903cc3510ad05a17e63f1c068d Mon Sep 17 00:00:00 2001
From: ellizio <profillive@mail.ru>
Date: Thu, 15 Aug 2024 10:55:56 +0300
Subject: [PATCH 2/2] Updated readme

---
 CHANGELOG.md | 3 +++
 README.md    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b77dd0..5e335e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.0]
+- Added missing odata-cli options
+
 ## [1.1.0]
 - odata-cli 0.3.1 support
 - UI improvements and fixes
diff --git a/README.md b/README.md
index 3ae6720..fd74fb4 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@
 
 | Plugin version | odata-cli version |
 |----------------|-------------------|
+| 1.2.0          | 0.3.1, 0.3.0      |
 | 1.1.0          | 0.3.1, 0.3.0      |
 | 1.0.1          | 0.2.1             |
 | 1.0.0          | 0.2.1             |