Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Rider 2024.3 #515

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+8 −8
Open

Add support for Rider 2024.3 #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5402ce5
Add support for Rider 2024.3
johanneswolfgruber Nov 15, 2024
f7c3586
Fix obsolete warning in RiderXamlStylerHost.cs
johanneswolfgruber Nov 15, 2024
2bc80cb
Bump JDK version
johanneswolfgruber Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/pipelines/templates/build-extension-rider-public.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
gradleOptions: '-Xmx3072m'
options: '-PPluginVersion=$(pluginVersion)'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.17'
jdkVersionOption: '1.21'
jdkArchitectureOption: 'x64'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
Expand Down
8 changes: 4 additions & 4 deletions src/XamlStyler.Extension.Rider/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ plugins {
id 'java'

// RIDER: May need updating with new Rider releases
id 'org.jetbrains.kotlin.jvm' version '1.9.10'
id 'com.jetbrains.rdgen' version '2024.1.1'
id 'org.jetbrains.kotlin.jvm' version '2.0.21'
id 'com.jetbrains.rdgen' version '2024.3.1'

// RIDER: Will probably need updating with new Rider releases, use latest version number from https://github.com/JetBrains/gradle-intellij-plugin/releases
id 'org.jetbrains.intellij.platform' version '2.0.1'
id 'org.jetbrains.intellij.platform' version '2.1.0'
}

ext {
Expand Down Expand Up @@ -52,7 +52,7 @@ sourceSets {
}

compileKotlin {
kotlinOptions { jvmTarget = "17" }
kotlinOptions { jvmTarget = "21" }
}

task compileDotNet {
Expand Down
2 changes: 1 addition & 1 deletion src/XamlStyler.Extension.Rider/dotnet/Plugin.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<!-- RIDER: To be updated with new Rider release -->

<SdkVersion>2024.2.0</SdkVersion>
<SdkVersion>2024.3.0</SdkVersion>
<Title>XAML Styler</Title>
<Description>XAML Styler is an extension that formats XAML source code based on a set of styling rules. This tool can help you/your team maintain a better XAML coding style as well as a much better XAML readability.</Description>

Expand Down
2 changes: 1 addition & 1 deletion ...er.Extension.Rider/dotnet/Xavalon.XamlStyler.Extension.Rider/Rider/RiderXamlStylerHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace Xavalon.XamlStyler.Extension.Rider.Rider
{
[SolutionComponent]
[SolutionComponent(JetBrains.Application.Parts.Instantiation.DemandAnyThreadSafe)]
public class RiderXamlStylerHost
{
[NotNull] private readonly Lifetime _lifetime;
Expand Down
2 changes: 1 addition & 1 deletion src/XamlStyler.Extension.Rider/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ BuildConfiguration=Release
# 2021.2 (stable versions)
#
# RIDER: To be updated with new Rider release
ProductVersion=2024.2
ProductVersion=2024.3
Loading