Skip to content

Commit e37a025

Browse files
NicoVermeirNVermeirZarpyk
authored
adds support for Rider 2024.2 (#499)
* adds support for Rider 2024.2 * fix intellij version * Migrate to jetbrains platform 2.0.1 --------- Co-authored-by: Nico Vermeir <[email protected]> Co-authored-by: Zarpyk <[email protected]>
1 parent 14dc6e1 commit e37a025

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

src/XamlStyler.Extension.Rider/build.gradle

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,37 @@ plugins {
66

77
// RIDER: May need updating with new Rider releases
88
id 'org.jetbrains.kotlin.jvm' version '1.9.10'
9-
id 'com.jetbrains.rdgen' version '2023.2.0'
9+
id 'com.jetbrains.rdgen' version '2024.1.1'
1010

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

1515
ext {
1616
isWindows = Os.isFamily(Os.FAMILY_WINDOWS)
1717
rdLibDirectory = {
18-
new File(setupDependencies.idea.get().classes, "lib/rd")
18+
new File(intellijPlatform.platformPath.resolve("lib/rd/").toAbsolutePath().toString())
1919
}
2020
}
2121

2222
repositories {
2323
maven { url 'https://cache-redirector.jetbrains.com/intellij-repository/snapshots' }
2424
maven { url 'https://cache-redirector.jetbrains.com/maven-central' }
25+
intellijPlatform {
26+
defaultRepositories()
27+
jetbrainsRuntime()
28+
}
29+
}
30+
31+
dependencies {
32+
intellijPlatform {
33+
rider("${ProductVersion}")
34+
jetbrainsRuntime()
35+
}
2536
}
2637

2738
wrapper {
28-
gradleVersion = '8.5'
39+
gradleVersion = '8.10'
2940
distributionType = Wrapper.DistributionType.ALL
3041
distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
3142
}
@@ -75,10 +86,7 @@ buildPlugin {
7586
}
7687
}
7788

78-
intellij {
79-
type = 'RD'
80-
version = "${ProductVersion}"
81-
downloadSources = false
89+
intellijPlatform {
8290
instrumentCode = false
8391
}
8492

@@ -88,7 +96,7 @@ runIde {
8896

8997
// Rider's backend doesn't support dynamic plugins. It might be possible to work with auto-reload of the frontend
9098
// part of a plugin, but there are dangers about keeping plugins in sync
91-
autoReloadPlugins = false
99+
autoReload = false
92100

93101
// gradle-intellij-plugin will download the default version of the JBR for the snapshot. Update if required
94102
// jbrVersion = "jbr_jcef-11_0_6b765.40" // https://confluence.jetbrains.com/display/JBR/Release+notes

src/XamlStyler.Extension.Rider/dotnet/Plugin.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<!-- RIDER: To be updated with new Rider release -->
44

5-
<SdkVersion>2024.1.0</SdkVersion>
5+
<SdkVersion>2024.2.0</SdkVersion>
66
<Title>XAML Styler</Title>
77
<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>
88

src/XamlStyler.Extension.Rider/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ BuildConfiguration=Release
1818
# 2021.2 (stable versions)
1919
#
2020
# RIDER: To be updated with new Rider release
21-
ProductVersion=2024.1
21+
ProductVersion=2024.2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-7.6-all.zip
3+
distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.10-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)