diff --git a/CHANGELOG.md b/CHANGELOG.md index 42de025..85a4cd0 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] +## [233.1.0] - 2023-12-27 +### Added +- General: Support for Rider 2023.3 + ## [232.0.0-rc1] - 2023-07-27 ### Added - General: Support for Rider 2023.2 @@ -45,7 +49,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/v232.0.0-rc1...HEAD +[Unreleased]: https://github.com/seclerp/rider-monogame/compare/v233.1.0...HEAD +[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 [223.0.0]: https://github.com/seclerp/rider-monogame/compare/v1.0.1...v223.0.0 diff --git a/ROADMAP.md b/ROADMAP.md deleted file mode 100644 index 563cc83..0000000 --- a/ROADMAP.md +++ /dev/null @@ -1,5 +0,0 @@ -## 2.0.0 - -- [ ] MGCB: Editing data in the previewer -- [ ] MGCB: Drop-downs for known data types -- [ ] MGCB: Ability to build specific entries directly from the text editor diff --git a/build.gradle.kts b/build.gradle.kts index 68d5340..6a9b739 100644 --- a/build.gradle.kts +++ b/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.0") + classpath("com.jetbrains.rd:rd-gen:2023.3.2") } } @@ -25,8 +25,8 @@ 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.15.0" - id("org.jetbrains.kotlin.jvm") version "1.8.20" + id("org.jetbrains.intellij") version "1.16.1" + id("org.jetbrains.kotlin.jvm") version "1.9.22" // https://plugins.gradle.org/plugin/org.jetbrains.grammarkit id("org.jetbrains.grammarkit") version "2022.3.1" } @@ -46,7 +46,6 @@ val pluginVersion: String by project val buildConfiguration = ext.properties["buildConfiguration"] ?: "Debug" val publishToken: String by project -val publishDistributionFile: String by project val publishChannel: String by project val rdLibDirectory: () -> File = { file("${tasks.setupDependencies.get().idea.get().classes}/lib/rd") } @@ -252,8 +251,8 @@ tasks { } patchPluginXml { - sinceBuild.set("232.0") - untilBuild.set("232.*") + sinceBuild.set("233.0") + untilBuild.set("233.*") val latestChangelog = try { changelog.getUnreleased() } catch (_: MissingVersionException) { @@ -318,7 +317,6 @@ tasks { publishPlugin { token.set(publishToken) - distributionFile.set(File(publishDistributionFile)) channels.set(listOf(publishChannel)) } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6b41a4f..f58863f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ javaVersion=17 dotnetPluginId=Rider.Plugins.MonoGame riderPluginId=me.seclerp.rider.plugins.monogame -pluginVersion=232.1.0 +pluginVersion=233.1.0 buildConfiguration=Debug @@ -15,7 +15,7 @@ publishChannel=default # Release: 2020.2 # Nightly: 2020.3-SNAPSHOT # EAP: 2020.3-EAP2-SNAPSHOT -productVersion=2023.2 +productVersion=2023.3.2 # 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/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/previewer/MgcbEditorPreviewer.kt b/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/previewer/MgcbEditorPreviewer.kt index 7e34049..525f7d0 100644 --- a/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/previewer/MgcbEditorPreviewer.kt +++ b/src/rider/main/kotlin/me/seclerp/rider/plugins/monogame/mgcb/previewer/MgcbEditorPreviewer.kt @@ -48,8 +48,9 @@ class MgcbEditorPreviewer( private val previewerPanel = lazy { val root = JBSplitter(false, 0.5f).apply { dividerWidth = 2 + val schema = EditorColorsManager.getInstance().globalScheme divider.background = JBColor.lazy { - EditorColorsManager.getInstance().globalScheme.getColor(EditorColors.PREVIEW_BORDER_COLOR) + schema.getColor(EditorColors.PREVIEW_BORDER_COLOR) ?: schema.defaultBackground } } @@ -95,8 +96,9 @@ class MgcbEditorPreviewer( firstComponent = propertiesPanel secondComponent = processorParamsPanel dividerWidth = 2 + val schema = EditorColorsManager.getInstance().globalScheme divider.background = JBColor.lazy { - EditorColorsManager.getInstance().globalScheme.getColor(EditorColors.PREVIEW_BORDER_COLOR) + schema.getColor(EditorColors.PREVIEW_BORDER_COLOR) ?: schema.defaultBackground } } }