Skip to content

Commit fb2a0a7

Browse files
sbouchetadietish
authored andcommitted
chore: fix latest IJ / IC 2025.1
Signed-off-by: Stephane Bouchet <[email protected]>
1 parent f87c8bb commit fb2a0a7

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

build.gradle.kts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,17 @@ dependencies {
4343
intellijIdeaCommunity(ideaVersion)
4444

4545
// Bundled Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
46-
bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
46+
// starting from 2024.3, all json related code is know on its own plugin
47+
val platformBundledPlugins = ArrayList<String>()
48+
platformBundledPlugins.addAll(providers.gradleProperty("platformBundledPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }.get())
49+
/*
50+
* platformVersion check for JSON breaking changes since 2024.3
51+
*/
52+
if (ideaVersion.startsWith("2024.3") || ideaVersion.startsWith("25")) {
53+
platformBundledPlugins.add("com.intellij.modules.json")
54+
}
55+
println("use bundled Plugins: $platformBundledPlugins")
56+
bundledPlugins(platformBundledPlugins)
4757

4858
// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
4959
plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ jetBrainsToken=invalid
33
jetBrainsChannel=stable
44

55
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#setting-up-intellij-platform
6-
platformVersion=2024.3
6+
platformVersion=2023.1
77

88
# Gradle Releases -> https://github.com/gradle/gradle/releases
99
gradleVersion=8.5
1010

1111
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html#dependency-declaration-in-pluginxml
12-
platformBundledPlugins=org.jetbrains.plugins.yaml, org.jetbrains.plugins.terminal, com.intellij.modules.json
12+
platformBundledPlugins=org.jetbrains.plugins.yaml, org.jetbrains.plugins.terminal
1313
platformPlugins=com.redhat.devtools.intellij.telemetry:1.2.0.59
1414

1515
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html

0 commit comments

Comments
 (0)