Prepare 241.0.0-rc1 release

- Fix compilation
- Bump dependencies
- Update CHANGELOG
- Bump platform version

CHANGELOG.md

@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [241.0.0-rc1] - 2024-03-28
+### Added
+- General: Support for Rider 2024.1 RC
+
 ## [233.1.0] - 2023-12-27
 ### Added
 - General: Support for Rider 2023.3
@@ -49,7 +53,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Open in external MGCB editor action
 - Additional file templates
 
-[Unreleased]: https://github.com/seclerp/rider-monogame/compare/v233.1.0...HEAD
+[Unreleased]: https://github.com/seclerp/rider-monogame/compare/v241.0.0-rc1...HEAD
+[241.0.0-rc1]: https://github.com/seclerp/rider-monogame/compare/v233.1.0...v241.0.0-rc1
 [233.1.0]: https://github.com/seclerp/rider-monogame/compare/v232.0.0-rc1...v233.1.0
 [232.0.0-rc1]: https://github.com/seclerp/rider-monogame/compare/v231.1.0...v232.0.0-rc1
 [231.1.0]: https://github.com/seclerp/rider-monogame/compare/v223.0.0...v231.1.0

build.gradle.kts

@@ -11,7 +11,7 @@ buildscript {
 
     // https://search.maven.org/artifact/com.jetbrains.rd/rd-gen
     dependencies {
-        classpath("com.jetbrains.rd:rd-gen:2023.3.2")
+        classpath("com.jetbrains.rd:rd-gen:2024.1.1")
     }
 }
 
@@ -25,10 +25,11 @@ plugins {
     // https://plugins.gradle.org/plugin/org.jetbrains.changelog
     id("org.jetbrains.changelog") version "2.2.0"
     // https://plugins.gradle.org/plugin/org.jetbrains.intellij
-    id("org.jetbrains.intellij") version "1.16.1"
-    id("org.jetbrains.kotlin.jvm") version "1.9.22"
+    id("org.jetbrains.intellij") version "1.17.2"
+    // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
+    id("org.jetbrains.kotlin.jvm") version "1.9.23"
     // https://plugins.gradle.org/plugin/org.jetbrains.grammarkit
-    id("org.jetbrains.grammarkit") version "2022.3.1"
+    id("org.jetbrains.grammarkit") version "2022.3.2.2"
 }
 
 apply {
@@ -129,21 +130,20 @@ intellij {
 tasks {
     generateLexer {
         sourceFile.set(file("src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/Mgcb.flex"))
-        targetDir.set("src/rider/gen/me/seclerp/rider/plugins/monogame/mgcb")
-        targetClass.set("MgcbLexer")
+        targetOutputDir.set(file("src/rider/gen/me/seclerp/rider/plugins/monogame/mgcb"))
         purgeOldFiles.set(true)
     }
 
     generateParser {
         sourceFile.set(file("src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/Mgcb.bnf"))
-        targetRoot.set("src/rider/gen")
+        targetRootOutputDir.set(file("src/rider/gen"))
         pathToParser.set("/parser/MgcbParser.java")
         pathToPsiRoot.set("/psi")
         purgeOldFiles.set(true)
     }
 
     wrapper {
-        gradleVersion = "7.5.1"
+        gradleVersion = "8.3"
         distributionType = Wrapper.DistributionType.ALL
         distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
     }
@@ -160,7 +160,7 @@ tasks {
         doLast {
             nuGetConfigFile.writeTextIfChanged("""
                 <?xml version="1.0" encoding="utf-8"?>
-                <!-- Auto-generated from 'generateNuGetConfig' task of old.build_gradle.kts -->
+                <!-- Auto-generated from 'generateNuGetConfig' task of build.gradle.kts -->
                 <!-- Run `gradlew :prepare` to regenerate -->
                 <configuration>
                   <packageSources>
@@ -251,8 +251,8 @@ tasks {
     }
 
     patchPluginXml {
-        sinceBuild.set("233.0")
-        untilBuild.set("233.*")
+        sinceBuild.set("241.0")
+        untilBuild.set("241.*")
         val latestChangelog = try {
             changelog.getUnreleased()
         } catch (_: MissingVersionException) {

gradle.properties

@@ -4,7 +4,7 @@ javaVersion=17
 
 dotnetPluginId=Rider.Plugins.MonoGame
 riderPluginId=me.seclerp.rider.plugins.monogame
-pluginVersion=233.1.0
+pluginVersion=241.0.0-rc1
 
 buildConfiguration=Debug
 
@@ -15,7 +15,7 @@ publishChannel=default
 #   Release:  2020.2
 #   Nightly:  2020.3-SNAPSHOT
 #   EAP:      2020.3-EAP2-SNAPSHOT
-productVersion=2023.3.2
+productVersion=2024.1-RC1-SNAPSHOT
 
 # 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

src/rider/main/kotlin/me/seclerp/rider/extensions/workspaceModel/WorkspaceModelExtensions.kt

@@ -6,8 +6,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.platform.backend.workspace.WorkspaceModel
 import com.intellij.platform.backend.workspace.virtualFile
-import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager
-import com.intellij.workspaceModel.ide.getInstance
 import com.jetbrains.rider.projectView.workspace.ProjectModelEntity
 import com.jetbrains.rider.projectView.workspace.containingProjectEntity
 import com.jetbrains.rider.projectView.workspace.getContentRootUrl
@@ -21,6 +19,6 @@ fun WorkspaceModel.containingProjectEntity(file: VirtualFile, project: Project):
 
 fun WorkspaceModel.containingProjectDirectory(file: VirtualFile, project: Project): VirtualFile? {
     return containingProjectEntity(file, project)
-        ?.getContentRootUrl(VirtualFileUrlManager.getInstance(project))
+        ?.getContentRootUrl(WorkspaceModel.getInstance(project).getVirtualFileUrlManager())
         ?.virtualFile
 }