From 9978a36b72ee08be7a5f7bb612b5f8c708a32073 Mon Sep 17 00:00:00 2001 From: Alexander Jeckmans Date: Fri, 10 Nov 2023 13:47:17 +0100 Subject: [PATCH 1/6] Updated JetBrains.Rider.SDK package versions to the latest release. Set until-build in plugin metadata to * to allow marketplace mechanism to determine if the plugin will work with newer Rider versions or not. --- .../ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj | 4 ++-- .../ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj | 2 +- src/rider/main/resources/META-INF/plugin.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj index 8f8c313..82be7e1 100644 --- a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj +++ b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj index c2545dd..90d80c5 100644 --- a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj +++ b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml index 7389877..58c610c 100644 --- a/src/rider/main/resources/META-INF/plugin.xml +++ b/src/rider/main/resources/META-INF/plugin.xml @@ -3,7 +3,7 @@ SpecFlow for Rider _PLACEHOLDER_ SpecFlow - + com.intellij.modules.rider From 389e9a4c5375669261fd30b645e6f7e7bf4e5d40 Mon Sep 17 00:00:00 2001 From: Alexander Jeckmans Date: Fri, 10 Nov 2023 13:50:13 +0100 Subject: [PATCH 2/6] Use the correct way of updating the sdk version --- CHANGELOG.md | 4 ++++ gradle.properties | 4 ++-- src/dotnet/Plugin.props | 2 +- .../ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj | 2 +- .../ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91bea95..fcbdedc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. 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.18.0 +### Added +- Support for Rider 2023.2.3 + ## 1.17.0 ### Added - Support for Rider 2023.2-EAP6-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 74793b5..a601257 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx2g DotnetPluginId=ReSharperPlugin.SpecflowRiderPlugin DotnetSolution=SpecflowRiderPlugin.sln RiderPluginId=specflowriderplugin -PluginVersion=1.17.0 +PluginVersion=1.18.0 BuildConfiguration=Release @@ -15,7 +15,7 @@ BuildConfiguration=Release # 2019.2-SNAPSHOT # 2019.2-EAP2-SNAPSHOT # 2019.2 -ProductVersion=2023.2-EAP6-SNAPSHOT +ProductVersion=2023.2.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/src/dotnet/Plugin.props b/src/dotnet/Plugin.props index 669d19c..7a23368 100644 --- a/src/dotnet/Plugin.props +++ b/src/dotnet/Plugin.props @@ -1,6 +1,6 @@ - 2023.2.0-eap06 + 2023.2.3 SpecFlow for Rider diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj index 82be7e1..6ed2aab 100644 --- a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj +++ b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj index 90d80c5..c2545dd 100644 --- a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj +++ b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/ReSharperPlugin.SpecflowRiderPlugin.Rider.csproj @@ -13,7 +13,7 @@ - + From 18c966a2d18aa57a0bc860a46f955e7e67d3913a Mon Sep 17 00:00:00 2001 From: Alexander Jeckmans Date: Fri, 10 Nov 2023 16:43:55 +0100 Subject: [PATCH 3/6] Uodate com.jetbrains.rdgen from 2023.2.2 to 2023.3.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 31b45de..b7c33a1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'java' id 'org.jetbrains.kotlin.jvm' version '1.8.22' id 'org.jetbrains.intellij' version '1.13.3' // https://github.com/JetBrains/gradle-intellij-plugin/releases - id 'com.jetbrains.rdgen' version '2023.2.2' // https://github.com/JetBrains/rd/releases + id 'com.jetbrains.rdgen' version '2023.3.2' // https://github.com/JetBrains/rd/releases } ext { From 90a5bdf7989fa457aea0eba0d67163dd06cb8c68 Mon Sep 17 00:00:00 2001 From: Alexander Jeckmans Date: Fri, 10 Nov 2023 16:49:18 +0100 Subject: [PATCH 4/6] Uodate the generated files for 2023.2.3 --- .../Rider/SpecflowRiderPluginModel.Generated.cs | 2 +- .../specflowriderplugin/SpecflowRiderPluginModel.Generated.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Rider/SpecflowRiderPluginModel.Generated.cs b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Rider/SpecflowRiderPluginModel.Generated.cs index 4b09cc7..a536b19 100644 --- a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Rider/SpecflowRiderPluginModel.Generated.cs +++ b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Rider/SpecflowRiderPluginModel.Generated.cs @@ -1,6 +1,6 @@ //------------------------------------------------------------------------------ // -// This code was generated by a RdGen v1.10. +// This code was generated by a RdGen v1.12. // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/specflowriderplugin/SpecflowRiderPluginModel.Generated.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/specflowriderplugin/SpecflowRiderPluginModel.Generated.kt index f73f92d..68994d2 100644 --- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/specflowriderplugin/SpecflowRiderPluginModel.Generated.kt +++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/specflowriderplugin/SpecflowRiderPluginModel.Generated.kt @@ -103,6 +103,8 @@ class SpecflowRiderPluginModel private constructor( ) } //contexts + //threading + override val extThreading: ExtThreadingKind get() = ExtThreadingKind.Default } val Solution.specflowRiderPluginModel get() = getOrCreateExtension("specflowRiderPluginModel", ::SpecflowRiderPluginModel) @@ -182,4 +184,5 @@ data class MyStructure ( } //deepClone //contexts + //threading } From c2609d291f50dc4b9aeecf9ffb30a4bcfdde0f53 Mon Sep 17 00:00:00 2001 From: ajeckmans Date: Tue, 14 Nov 2023 11:59:49 +0100 Subject: [PATCH 5/6] Update some more packages --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b7c33a1..ae087c1 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.apache.tools.ant.taskdefs.condition.Os plugins { id 'java' id 'org.jetbrains.kotlin.jvm' version '1.8.22' - id 'org.jetbrains.intellij' version '1.13.3' // https://github.com/JetBrains/gradle-intellij-plugin/releases + id 'org.jetbrains.intellij' version '1.16.0' // https://github.com/JetBrains/gradle-intellij-plugin/releases id 'com.jetbrains.rdgen' version '2023.3.2' // https://github.com/JetBrains/rd/releases } @@ -25,7 +25,7 @@ repositories { } wrapper { - gradleVersion = '7.3' + gradleVersion = '7.6' distributionType = Wrapper.DistributionType.ALL distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db14f7b..71f7f00 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 70f9dad36dc6a93e2492a06b56ceca474bb28b5b Mon Sep 17 00:00:00 2001 From: ajeckmans Date: Tue, 14 Nov 2023 12:03:02 +0100 Subject: [PATCH 6/6] Set kotlin.incremental.useClasspathSnapshot as per https://jb.gg/intellij-platform-kotlin-oom --- gradle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle.properties b/gradle.properties index a601257..fd5a6e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,3 +20,5 @@ ProductVersion=2023.2.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 kotlin.stdlib.default.dependency=false +# see: https://jb.gg/intellij-platform-kotlin-oom +kotlin.incremental.useClasspathSnapshot=false \ No newline at end of file