Merge pull request #203 from ajeckmans/automatically-support-newer-ve…

…rsions-using-marketplace-mechanic Updated JetBrains.Rider.SDK package versions to the latest release.
SpecFlowOSS · Nov 14, 2023 · cecd696 · cecd696
2 parents 281f68f + 70f9dad
commit cecd696
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git 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/build.gradle b/build.gradle
@@ -4,8 +4,8 @@ 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 'com.jetbrains.rdgen' version '2023.2.2'     // https://github.com/JetBrains/rd/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
 }
 
 ext {
@@ -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.properties b/gradle.properties
@@ -7,16 +7,18 @@ org.gradle.jvmargs=-Xmx2g
 DotnetPluginId=ReSharperPlugin.SpecflowRiderPlugin
 DotnetSolution=SpecflowRiderPlugin.sln
 RiderPluginId=specflowriderplugin
-PluginVersion=1.17.0
+PluginVersion=1.18.0
 
 BuildConfiguration=Release
 
 # Possible values:
 #    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
 kotlin.stdlib.default.dependency=false
+# see: https://jb.gg/intellij-platform-kotlin-oom
+kotlin.incremental.useClasspathSnapshot=false
diff --git 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
diff --git a/src/dotnet/Plugin.props b/src/dotnet/Plugin.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <SdkVersion>2023.2.0-eap06</SdkVersion>
+    <SdkVersion>2023.2.3</SdkVersion>
 
     <Title>SpecFlow for Rider</Title>
 

diff --git a/...eSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj b/...eSharperPlugin.SpecflowRiderPlugin.Tests/ReSharperPlugin.SpecflowRiderPlugin.Tests.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="FluentAssertions" Version="6.5.1" />
     <PackageReference Include="JetBrains.Rider.SDK.Tests" Version="$(SdkVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="SpecFlow" Version="3.9.58" />
   </ItemGroup>
 

diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Rider/SpecflowRiderPluginModel.Generated.cs b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Rider/SpecflowRiderPluginModel.Generated.cs
@@ -1,6 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     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/...lin/com/jetbrains/rider/plugins/specflowriderplugin/SpecflowRiderPluginModel.Generated.kt b/...lin/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
 }
diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
   <name>SpecFlow for Rider</name>
   <version>_PLACEHOLDER_</version>
   <vendor url="https://specflow.org/">SpecFlow</vendor>
-  <idea-version since-build="_PLACEHOLDER_" until-build="_PLACEHOLDER_" />
+  <idea-version since-build="_PLACEHOLDER_" until-build="*" />
   <depends>com.intellij.modules.rider</depends>
 
   <description>