5.6.0

mwsmws22 · Apr 9, 2024 · f2cc3cf · f2cc3cf
1 parent 2f10e83
commit f2cc3cf
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # KdbInsideBrains Changelog
 
+## [5.6.0]
+
+### Changed
+
+- IDEA 2024.1 is the default dev version. Deprecation errors removed. Grammar Kit upgraded to 2022.3.2.2.
+
 ## [5.5.2]
 
 ### Fixed

diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,7 @@ plugins {
     id 'maven-publish'
     id 'org.jetbrains.intellij' version '1.17.1'
     id 'org.jetbrains.changelog' version '2.2.0'
-    // 2022.3.2.1 has an issue: https://github.com/JetBrains/gradle-grammar-kit-plugin/issues/168
-    id "org.jetbrains.grammarkit" version "2022.3.2"
+    id "org.jetbrains.grammarkit" version "2022.3.2.2"
 }
 
 Properties versionProps = new Properties()
@@ -52,15 +51,15 @@ apply plugin: 'org.jetbrains.changelog'
 apply plugin: 'org.jetbrains.grammarkit'
 generateLexer {
     sourceFile = file("src/main/resources/org/kdb/inside/brains/q.flex")
-    targetDir = "src/main/gen/org/kdb/inside/brains"
+    targetOutputDir = file("src/main/gen/org/kdb/inside/brains")
     targetClass = "QLexer"
     purgeOldFiles = true
     dependsOn("sourcesJar")
 }
 
 generateParser {
     sourceFile = file("src/main/resources/org/kdb/inside/brains/q.bnf")
-    targetRoot = 'src/main/gen'
+    targetRootOutputDir = file('src/main/gen')
     pathToParser = 'org/kdb/inside/brains/parser/QParser.java'
     pathToPsiRoot = 'org/kdb/inside/brains/psi'
     purgeOldFiles = true

diff --git a/gradle.properties b/gradle.properties
@@ -10,12 +10,12 @@ pluginJavaVersion=17
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html for available build versions
 # or https://jb.gg/intellij-platform-builds-list
-pluginVerifierVersions=2022.3, 2022.3.3, 2023.1.1, 2023.2.5, 2023.3.6
+pluginVerifierVersions=2022.3, 2022.3.3, 2023.1.1, 2023.2.5, 2023.3.6, 2024.1
 platformType=IC
-#platformVersion=241-EAP-SNAPSHOT
-#platformPlugins=java, PsiViewer:241-SNAPSHOT
-platformVersion=2023.3.6
-platformPlugins=java, PsiViewer:233.2
+platformVersion=2024.1
+platformPlugins=java, PsiViewer:241-SNAPSHOT
+#platformVersion=2023.3.6
+#platformPlugins=java, PsiViewer:233.2
 #platformVersion=2023.2.5
 #platformPlugins=java, PsiViewer:232.2
 #platformVersion=2023.1.3

diff --git a/src/main/java/org/kdb/inside/brains/view/chart/template/CreateTemplateDialog.java b/src/main/java/org/kdb/inside/brains/view/chart/template/CreateTemplateDialog.java
@@ -20,7 +20,7 @@ public class CreateTemplateDialog extends DialogWrapper {
     private final JBCheckBox quickAction = new JBCheckBox("Add to quick popup actions");
 
     public CreateTemplateDialog(@NotNull Project project, @NotNull ChartTemplate template) {
-        super(project, false, IdeModalityType.PROJECT);
+        super(project, false, IdeModalityType.IDE);
         setTitle("Creating Chart Template");
 
         this.template = template;

diff --git a/src/main/java/org/kdb/inside/brains/view/console/UploadFileDialog.java b/src/main/java/org/kdb/inside/brains/view/console/UploadFileDialog.java
@@ -31,7 +31,7 @@ class UploadFileDialog extends DialogWrapper {
     private TextFieldWithBrowseButton browseButton;
 
     protected UploadFileDialog(@Nullable Project project) {
-        super(project, false, IdeModalityType.PROJECT);
+        super(project, false, IdeModalityType.IDE);
         this.project = project;
         setTitle("Uploading File to Instance");
         init();

diff --git a/src/main/java/org/kdb/inside/brains/view/export/FlipTableExportAction.java b/src/main/java/org/kdb/inside/brains/view/export/FlipTableExportAction.java
@@ -91,7 +91,7 @@ private static class ResultDialog extends DialogWrapper {
         private final TableResultView resultView;
 
         public ResultDialog(@Nullable Project project, TableResultView resultView) {
-            super(project, false, DialogWrapper.IdeModalityType.PROJECT);
+            super(project, false, DialogWrapper.IdeModalityType.IDE);
             this.resultView = resultView;
             setOKButtonText("Close");
             init();

diff --git a/src/main/java/org/kdb/inside/brains/view/treeview/forms/InstanceEditorDialog.java b/src/main/java/org/kdb/inside/brains/view/treeview/forms/InstanceEditorDialog.java
@@ -76,7 +76,7 @@ public boolean test(String s) {
     }
 
     public InstanceEditorDialog(@NotNull Mode mode, @NotNull Project project, @Nullable StructuralItem parent, @Nullable KdbInstance instance, @NotNull Predicate<String> nameValidator) {
-        super(project, false, IdeModalityType.PROJECT);
+        super(project, false, IdeModalityType.IDE);
         this.mode = mode;
         this.project = project;
         this.nameValidator = nameValidator;

diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-pluginVersion=5.5.2
+pluginVersion=5.6.0