Skip to content

Commit 37f55c2

Browse files
committed
Dropping support for intellij 2024.x and targeting 2025.x due to breaking changes in MoveFileHandler.
1 parent 027a4d9 commit 37f55c2

File tree

7 files changed

+37
-38
lines changed

7 files changed

+37
-38
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false # set this to true if you want to cancel all builds if one fails.
1919
matrix:
20-
IDEA_VERSION: [2024.3]
20+
IDEA_VERSION: [2025.1]
2121
OS: [macos-13, ubuntu-latest, windows-latest]
2222

2323
runs-on: ${{ matrix.OS }}

.github/workflows/prerelease.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
strategy:
4141
fail-fast: true # cancel all builds if one fails.
4242
matrix:
43-
IDEA_VERSION: [2024.3]
43+
IDEA_VERSION: [2025.1]
4444
needs: prepare
4545
runs-on: ubuntu-latest
4646
steps:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
fail-fast: true # cancel all builds if one fails.
5151
matrix:
52-
IDEA_VERSION: [ 2024.3 ]
52+
IDEA_VERSION: [ 2025.1 ]
5353
needs: prepare
5454
runs-on: ubuntu-latest
5555
steps:

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Changelog
2+
## 1.6.8
3+
* Support for IntelliJ 2024.x is dropped due to breaking changes in refactoring API in IntelliJ 2025.
4+
25
## 1.6.7
36
* Fixed: Issue parsing postfix expressions after arrayAccess and callExpressions.
47
* improvement: more accurate logic determining if `case` expression is captureVariable or references.

build.gradle.kts

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import org.jetbrains.grammarkit.tasks.GenerateLexerTask
44
import org.jetbrains.grammarkit.tasks.GenerateParserTask
55
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
66
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
7+
import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformExtension
78
import org.jetbrains.intellij.platform.gradle.models.ProductRelease
89
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
910

@@ -16,7 +17,7 @@ plugins {
1617
// Kotlin support
1718
id("org.jetbrains.kotlin.jvm") version "2.0.21"
1819
// Gradle IntelliJ Plugin
19-
id("org.jetbrains.intellij.platform") version "2.1.0"
20+
id("org.jetbrains.intellij.platform") version "2.5.0"
2021
// Gradle Changelog Plugin
2122
id("org.jetbrains.changelog") version "2.0.0"
2223
// Gradle Qodana Plugin
@@ -79,7 +80,6 @@ dependencies {
7980

8081
intellijPlatform {
8182
pluginVerifier()
82-
instrumentationTools()
8383
create(platformType, platformVersion)
8484

8585
plugins(properties("platformPlugins").map { it.split(',') })
@@ -147,33 +147,24 @@ repositories {
147147
}
148148

149149
// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
150-
intellijPlatform {
151-
pluginConfiguration {
152-
name = properties("pluginName").get()
153-
group = properties("pluginGroup").get()
154-
155-
ideaVersion.sinceBuild.set(properties("pluginSinceBuild"))
156-
ideaVersion.untilBuild.set(properties("pluginUntilBuild"))
150+
intellijPlatform {
151+
pluginConfiguration {
152+
name = properties("pluginName").get()
153+
group = properties("pluginGroup").get()
157154

155+
ideaVersion.sinceBuild.set(properties("pluginSinceBuild"))
156+
ideaVersion.untilBuild.set(properties("pluginUntilBuild"))
158157
}
159-
verifyPlugin {
158+
159+
pluginVerification(fun IntelliJPlatformExtension.PluginVerification.() {
160160
freeArgs = listOf("-mute", "TemplateWordInPluginId,ForbiddenPluginIdPrefix")
161161
failureLevel = listOf(
162-
// VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS,
163162
VerifyPluginTask.FailureLevel.MISSING_DEPENDENCIES
164163
)
165164
ides {
166-
//TODO problem verifying 2024.2 beta, emojipicker not found, + timeout ?
167-
// recommended()
168-
select {
169-
sinceBuild.set("240")
170-
untilBuild.set("241.*")
171-
// sinceBuild.set(properties("pluginSinceBuild"))
172-
// untilBuild.set(properties("pluginUntilBuild"))
173-
}
165+
recommended()
174166
}
175-
}
176-
// instrumentCode = false
167+
})
177168
}
178169

179170

@@ -213,7 +204,7 @@ tasks {
213204
}
214205

215206
patchPluginXml {
216-
version =properties("pluginVersion").get();
207+
version = properties("pluginVersion").get();
217208
sinceBuild.set(properties("pluginSinceBuild"))
218209
untilBuild.set(properties("pluginUntilBuild"))
219210

gradle.properties

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pluginName = Haxe Toolkit Support
77
pluginRepositoryUrl = https://github.com/HaxeFoundation/intellij-haxe
88

99
# SemVer format -> https://semver.org
10-
pluginVersion = 1.6.7
10+
pluginVersion = 1.6.8
1111

1212
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
1313
platformType = IU
@@ -19,25 +19,30 @@ platformType = IU
1919
#platformVersion = 2024.2.1
2020
#platformVersion = 2024.1.7
2121
#platformVersion = 2024.3.1.1
22-
platformVersion = 2024.3.3
22+
#platformVersion = 2024.3.3
23+
platformVersion = 2025.1
2324
platformDownloadSources = true
2425

2526
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
2627
# for insight into build numbers and IntelliJ Platform versions.
27-
pluginSinceBuild = 242
28-
pluginUntilBuild = 243.*
28+
pluginSinceBuild = 251
29+
pluginUntilBuild = 251.*
2930

3031
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
3132
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
32-
# see flex/flash versions at : https://plugins.jetbrains.com/plugin/14508-flash-flex/versions/stable/252411
33+
# versions numbers can be found at :
34+
# flex/flash : https://plugins.jetbrains.com/plugin/14508-flash-flex/versions/stable/252411
35+
# classic UI : https://plugins.jetbrains.com/plugin/24468-classic-ui
36+
# Git Modal Commit Interface : https://plugins.jetbrains.com/plugin/26647-git-modal-commit-interface
37+
# OpenGL-Plugin : https://plugins.jetbrains.com/plugin/18470-glsl
3338

3439
# IC 2025.1
35-
#platformBundledPlugins = com.intellij.java, com.intellij.modules.json
36-
#platformPlugins = com.intellij.flex:251.20015.29, OpenGL-Plugin:1.1.4, com.intellij.classic.ui:251.20015.29
40+
platformBundledPlugins = com.intellij.java, com.intellij.modules.json
41+
platformPlugins = com.intellij.flex:251.23774.318, OpenGL-Plugin:1.1.4, com.intellij.classic.ui:251.23774.318, intellij.git.commit.modal:251.23774.33
3742

3843
# IC 2024.3.x
39-
platformBundledPlugins = com.intellij.java, com.intellij.modules.json
40-
platformPlugins = com.intellij.flex:243.22562.59, OpenGL-Plugin:1.1.4, com.intellij.classic.ui:243.21565.122
44+
#platformBundledPlugins = com.intellij.java, com.intellij.modules.json
45+
#platformPlugins = com.intellij.flex:243.22562.59, OpenGL-Plugin:1.1.4, com.intellij.classic.ui:243.21565.122
4146

4247
# IC 2024.3.1.1
4348
#platformBundledPlugins = com.intellij.java, com.intellij.modules.json

src/main/java/com/intellij/plugins/haxe/ide/refactoring/move/HaxeFileMoveHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ public List<UsageInfo> findUsages(PsiFile psiFile, PsiDirectory newParent, boole
5757
return null;
5858
}
5959
// 2024.x
60-
@Override
61-
public void retargetUsages(List<UsageInfo> usageInfos, Map<PsiElement, PsiElement> oldToNewMap) {}
60+
// @Override
61+
// public void retargetUsages(List<UsageInfo> usageInfos, Map<PsiElement, PsiElement> oldToNewMap) {}
6262

6363
// 2025.x
64-
// @Override
65-
// public void retargetUsages(@Unmodifiable @NotNull List<? extends UsageInfo> list, @NotNull Map<PsiElement, PsiElement> map) {}
64+
@Override
65+
public void retargetUsages(@Unmodifiable @NotNull List<? extends UsageInfo> list, @NotNull Map<PsiElement, PsiElement> map) {}
6666

6767
@Override
6868
public void updateMovedFile(PsiFile file) throws IncorrectOperationException {

0 commit comments

Comments
 (0)