Skip to content

Commit

Permalink
Prepare 232.0.0-rc1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
seclerp committed Jul 27, 2023
1 parent 0c347fb commit 3f0d2a1
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 40 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -246,7 +251,8 @@ tasks {
}

patchPluginXml {
untilBuild.set("231.*")
sinceBuild.set("232.0")
untilBuild.set("232.*")
val latestChangelog = try {
changelog.getUnreleased()
} catch (_: MissingVersionException) {
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 @@ javaVersion=17

dotnetPluginId=Rider.Plugins.MonoGame
riderPluginId=me.seclerp.rider.plugins.monogame
pluginVersion=231.1.0
pluginVersion=232.0.0-rc1

buildConfiguration=Debug

Expand All @@ -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
Expand Down
22 changes: 0 additions & 22 deletions settings.gradle

This file was deleted.

12 changes: 12 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Linq;
using JetBrains.Annotations;
using JetBrains.ProjectModel.NuGet.DotNetTools;
Expand Down
4 changes: 0 additions & 4 deletions src/dotnet/Rider.Plugins.MonoGame/Mgcb/MgcbToolsetTracker.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
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;
using JetBrains.DataFlow;
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;

Expand Down
4 changes: 1 addition & 3 deletions src/dotnet/Rider.Plugins.MonoGame/MonoGameRdModelHost.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using JetBrains.Annotations;
using JetBrains.Collections.Viewable;
using JetBrains.Lifetimes;
using JetBrains.ProjectModel;
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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3f0d2a1

Please sign in to comment.