Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to 1.2.0 #28

Merged
merged 2 commits into from
Aug 15, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
14 changes: 8 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down Expand Up @@ -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"
]
}

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.1.0
PluginVersion=1.2.0

BuildConfiguration=Debug

Expand All @@ -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
Expand Down
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>2023.3.0</SdkVersion>
<SdkVersion>2024.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 @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
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="_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>
Expand Down
Loading