From 3f0d2a15465dd74b2c270fe76506ac6ba79c2f36 Mon Sep 17 00:00:00 2001 From: Andrii Rublov Date: Thu, 27 Jul 2023 19:12:11 +0200 Subject: [PATCH] Prepare `232.0.0-rc1` release --- CHANGELOG.md | 8 ++++++- build.gradle.kts | 10 +++++++-- gradle.properties | 4 ++-- settings.gradle | 22 ------------------- settings.gradle.kts | 12 ++++++++++ .../Mgcb/MgcbEditorCommandNameResolver.cs | 1 - .../Mgcb/MgcbToolsetTracker.cs | 4 ---- .../MonoGameRdModelHost.cs | 4 +--- .../WorkspaceModelExtensions.kt | 6 ++--- .../mgcb/actions/OpenExternalEditorAction.kt | 2 +- .../MgcbToolsetConfigurableProvider.kt | 2 +- 11 files changed, 35 insertions(+), 40 deletions(-) delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/CHANGELOG.md b/CHANGELOG.md index 03c7796..42de025 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [232.0.0-rc1] - 2023-07-27 +### Added +- General: Support for Rider 2023.2 + ## [231.1.0] - 2023-07-11 ### Added - General: Support for Rider 2023.1 (#16) @@ -41,7 +45,9 @@ 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/v223.0.0...HEAD +[Unreleased]: https://github.com/seclerp/rider-monogame/compare/v232.0.0-rc1...HEAD +[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 [223.0.0]: https://github.com/seclerp/rider-monogame/compare/v1.0.1...v223.0.0 [222.0.0]: https://github.com/seclerp/rider-monogame/compare/v1.0.1...v222.0.0 [1.0.1]: https://github.com/seclerp/rider-monogame/compare/v1.0.0...v1.0.1 diff --git a/build.gradle.kts b/build.gradle.kts index 46b007f..8bd0ec4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,10 +10,15 @@ buildscript { // https://search.maven.org/artifact/com.jetbrains.rd/rd-gen dependencies { - classpath("com.jetbrains.rd:rd-gen:2023.1.2") + classpath("com.jetbrains.rd:rd-gen:2023.2.2") } } +repositories { + maven("https://cache-redirector.jetbrains.com/intellij-repository/snapshots") + maven("https://cache-redirector.jetbrains.com/maven-central") +} + plugins { id("me.filippov.gradle.jvm.wrapper") version "0.14.0" // https://plugins.gradle.org/plugin/org.jetbrains.changelog @@ -246,7 +251,8 @@ tasks { } patchPluginXml { - untilBuild.set("231.*") + sinceBuild.set("232.0") + untilBuild.set("232.*") val latestChangelog = try { changelog.getUnreleased() } catch (_: MissingVersionException) { diff --git a/gradle.properties b/gradle.properties index d92a171..3dab4d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ javaVersion=17 dotnetPluginId=Rider.Plugins.MonoGame riderPluginId=me.seclerp.rider.plugins.monogame -pluginVersion=231.1.0 +pluginVersion=232.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.1 +productVersion=2023.2-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 diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index d0251f6..0000000 --- a/settings.gradle +++ /dev/null @@ -1,22 +0,0 @@ -pluginManagement { - // Provide repositories to resolve plugins - repositories { - maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org" } - maven { url "https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap" } - maven { url "https://cache-redirector.jetbrains.com/myget.org.rd-snapshots.maven" } - } - resolutionStrategy { - eachPlugin { - // Gradle has to map a plugin dependency to Maven coordinates - '{groupId}:{artifactId}:{version}'. It tries - // to do use '{plugin.id}:{plugin.id}.gradle.plugin:version'. - // This doesn't work for rdgen, so we provide some help - if (requested.id.id == "com.jetbrains.rdgen") { - useModule("com.jetbrains.rd:rd-gen:${requested.version}") - } - } - } -} - -rootProject.name = 'rider-monogame' - -include ':protocol' \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..57b1662 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,12 @@ +pluginManagement { + repositories { + maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies") + maven("https://cache-redirector.jetbrains.com/plugins.gradle.org") + maven("https://oss.sonatype.org/content/repositories/snapshots/") + gradlePluginPortal() + } +} + +rootProject.name = "rider-monogame" + +include("protocol") \ No newline at end of file diff --git a/src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbEditorCommandNameResolver.cs b/src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbEditorCommandNameResolver.cs index 861b57f..7403724 100644 --- a/src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbEditorCommandNameResolver.cs +++ b/src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbEditorCommandNameResolver.cs @@ -1,4 +1,3 @@ -using System; using System.Linq; using JetBrains.Annotations; using JetBrains.ProjectModel.NuGet.DotNetTools; diff --git a/src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbToolsetTracker.cs b/src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbToolsetTracker.cs index 580a83e..7532f47 100644 --- a/src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbToolsetTracker.cs +++ b/src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbToolsetTracker.cs @@ -1,7 +1,4 @@ using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading; using JetBrains.Application.FileSystemTracker; using JetBrains.Application.Threading; using JetBrains.Collections.Viewable; @@ -9,7 +6,6 @@ using JetBrains.Lifetimes; using JetBrains.ProjectModel; using JetBrains.ProjectModel.NuGet.DotNetTools; -using JetBrains.ReSharper.Psi.Impl.CodeStyle; using JetBrains.Util; using Rider.Plugins.MonoGame.Extensions; diff --git a/src/dotnet/Rider.Plugins.MonoGame/MonoGameRdModelHost.cs b/src/dotnet/Rider.Plugins.MonoGame/MonoGameRdModelHost.cs index fe4344e..7f4405d 100644 --- a/src/dotnet/Rider.Plugins.MonoGame/MonoGameRdModelHost.cs +++ b/src/dotnet/Rider.Plugins.MonoGame/MonoGameRdModelHost.cs @@ -1,7 +1,4 @@ using System; -using System.Diagnostics; -using System.Linq; -using System.Threading; using JetBrains.Annotations; using JetBrains.Collections.Viewable; using JetBrains.Lifetimes; @@ -9,6 +6,7 @@ using JetBrains.ProjectModel.NuGet.DotNetTools; using JetBrains.Rd.Base; using JetBrains.RdBackend.Common.Features; +using JetBrains.ReSharper.Feature.Services.Protocol; using JetBrains.Util; using Rider.Plugins.MonoGame.Mgcb; diff --git a/src/rider/main/kotlin/me/seclerp/rider/extensions/workspaceModel/WorkspaceModelExtensions.kt b/src/rider/main/kotlin/me/seclerp/rider/extensions/workspaceModel/WorkspaceModelExtensions.kt index fe3acdc..0931cce 100644 --- a/src/rider/main/kotlin/me/seclerp/rider/extensions/workspaceModel/WorkspaceModelExtensions.kt +++ b/src/rider/main/kotlin/me/seclerp/rider/extensions/workspaceModel/WorkspaceModelExtensions.kt @@ -4,10 +4,10 @@ package me.seclerp.rider.extensions.workspaceModel import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile -import com.intellij.workspaceModel.ide.WorkspaceModel +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.intellij.workspaceModel.ide.virtualFile -import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager import com.jetbrains.rider.projectView.workspace.ProjectModelEntity import com.jetbrains.rider.projectView.workspace.containingProjectEntity import com.jetbrains.rider.projectView.workspace.getContentRootUrl diff --git a/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/actions/OpenExternalEditorAction.kt b/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/actions/OpenExternalEditorAction.kt index b1be10c..64eed89 100644 --- a/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/actions/OpenExternalEditorAction.kt +++ b/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/actions/OpenExternalEditorAction.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile -import com.intellij.workspaceModel.ide.workspaceModel +import com.intellij.platform.backend.workspace.workspaceModel import com.jetbrains.rider.model.RdProjectDescriptor import me.seclerp.rider.extensions.commandLine.CommandBuilder import me.seclerp.rider.extensions.commandLine.DefaultCommandExecutor diff --git a/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/settings/MgcbToolsetConfigurableProvider.kt b/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/settings/MgcbToolsetConfigurableProvider.kt index ce6933b..c68ffba 100644 --- a/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/settings/MgcbToolsetConfigurableProvider.kt +++ b/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/settings/MgcbToolsetConfigurableProvider.kt @@ -6,9 +6,9 @@ import com.intellij.openapi.options.SearchableConfigurable import com.intellij.openapi.project.Project import com.intellij.openapi.ui.DialogPanel import com.intellij.openapi.util.text.HtmlBuilder +import com.intellij.platform.backend.workspace.workspaceModel import com.intellij.ui.dsl.builder.bindText import com.intellij.ui.dsl.builder.panel -import com.intellij.workspaceModel.ide.workspaceModel import com.jetbrains.rd.platform.util.lifetime import com.jetbrains.rd.util.reactive.AddRemove import com.jetbrains.rd.util.reactive.map