Merge pull request #30195 from vespa-engine/bratseth/jetbrains-plugin-compatibility

Release 1.6

7 files changed, 39 insertions, 24 deletions

diff --git a/integration/intellij/build.gradle.kts b/integration/intellij/build.gradle.kts
index 39eb867e964..922c3aa1a19 100644
--- a/integration/intellij/build.gradle.kts
+++ b/integration/intellij/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group="ai.vespa"
-version="1.5.0" // Also update pom.xml version AND the version below if this is changed
+version="1.6.0" // Also update pom.xml version AND the version below if this is changed
 
 defaultTasks("buildPlugin")
 
@@ -43,7 +43,7 @@ sourceSets {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-  version.set("2023.2")
+  version.set("2023.3")
 }
 
 tasks {
@@ -55,11 +55,12 @@ tasks {
   }
 
   patchPluginXml {
-    version.set("1.5.0") // Keep in sync with pom.xml TODO: Use one version property
-    sinceBuild.set("232")
+    version.set("1.6.0") // Keep in sync with pom.xml TODO: Use one version property
     // Appears on the plugin page in preferences/plugins
     changeNotes.set("""
-       Support for IntelliJ 2023.2
+      Updated Vespa icon
+      Support for IntelliJ 2023.3
+      Compatibility with all JetBrains IDEs
     """)
   }
 
diff --git a/integration/intellij/pom.xml b/integration/intellij/pom.xml
index b57bd8d379f..8156ac8a142 100644
--- a/integration/intellij/pom.xml
+++ b/integration/intellij/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <artifactId>vespa-intellij</artifactId> <!-- Not used - plugin is build by gradle -->
-    <version>1.5.0</version> <!-- See copy-zip below, which depends on this being the same as the v. in build.gradle.kts -->
+    <version>1.6.0</version> <!-- See copy-zip below, which depends on this being the same as the v. in build.gradle.kts -->
     <description>
         Maven wrapper for the gradle build of this IntelliJ plugin.
     </description>
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdIcons.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdIcons.java
index acb07a9a747..15c24bf7351 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdIcons.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdIcons.java
@@ -12,7 +12,7 @@ import javax.swing.Icon;
  */
 public class SdIcons {
 
-    public static final Icon FILE = IconLoader.getIcon("icons/sd_icon.png", SdIcons.class);
+    public static final Icon FILE = IconLoader.getIcon("icons/sd_icon.svg", SdIcons.class);
     public static final Icon STRUCT_FIELD = IconLoader.getIcon("icons/struct_field_icon.png", SdIcons.class);
     public static final Icon IMPORTED_FIELD = IconLoader.getIcon("icons/imported_field_icon.png", SdIcons.class);
     public static final Icon DOCUMENT_SUMMARY = IconLoader.getIcon("icons/document_summary_icon.png", SdIcons.class);
diff --git a/integration/intellij/src/main/resources/META-INF/plugin.xml b/integration/intellij/src/main/resources/META-INF/plugin.xml
index 02f1bb4423e..2dae37b3d57 100644
--- a/integration/intellij/src/main/resources/META-INF/plugin.xml
+++ b/integration/intellij/src/main/resources/META-INF/plugin.xml
@@ -7,7 +7,6 @@
     <vendor>vespa.ai</vendor>
 
     <!-- Product and plugin compatibility requirements -->
-    <depends>com.intellij.java</depends>
     <depends>com.intellij.modules.platform</depends>
 
     <!-- Text to display as description on Preferences/Settings | Plugin page -->
diff --git a/integration/intellij/src/main/resources/META-INF/pluginIcon.svg b/integration/intellij/src/main/resources/META-INF/pluginIcon.svg
index 3a795976efd..aaffea9490a 100644
--- a/integration/intellij/src/main/resources/META-INF/pluginIcon.svg
+++ b/integration/intellij/src/main/resources/META-INF/pluginIcon.svg
@@ -1,19 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" data-name="Layer 1" viewBox="0 0 40 40" preserveAspectRatio="xMidYMin slice" xmlns="http://www.w3.org/2000/svg">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1696.06 1130.71">
   <defs>
-    <style>.cls-1{fill:#ffc43c;}.cls-2{fill:url(#linear-gradient);}.cls-3{fill:#1a7db6;}.cls-4{fill:url(#linear-gradient-2);}.cls-5{fill:#303030;}</style>
-    <linearGradient id="linear-gradient" x1="964.75" y1="34.82" x2="919.68" y2="63.4" gradientTransform="matrix(-0.276923, 0, 0, 0.276923, 291.653198, 2)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#da9728"/>
-      <stop offset="0.54" stop-color="#ffc43c"/>
-    </linearGradient>
-    <linearGradient id="linear-gradient-2" x1="46.38" y1="94.56" x2="-29.88" y2="53" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.276923, 0, 0, 0.276923, 3.212999, 2)">
-      <stop offset="0" stop-color="#005a8e"/>
-      <stop offset="0.54" stop-color="#1a7db6"/>
-    </linearGradient>
+    <style>
+      .cls-1 {
+        fill: #2e2f27;
+        stroke-width: 0px;
+      }
+    </style>
   </defs>
-  <title>VespaLogo copy</title>
-  <polygon class="cls-1" points="22.736 2 8.685 11.543 8.685 27.971 22.736 18.064 36.787 27.971 36.787 11.543 22.736 2"/>
-  <polygon class="cls-2" points="22.736 18.064 22.736 2 36.787 11.543 36.787 27.97 22.736 18.064"/>
-  <polygon class="cls-3" points="17.264 21.936 3.213 12.029 3.213 28.457 17.264 38 31.315 28.457 31.315 12.029 17.264 21.936"/>
-  <polygon class="cls-4" points="17.264 21.936 17.264 38 3.213 28.457 3.213 12.03 17.264 21.936"/>
+  <g id="Layer_1-2" data-name="Layer 1">
+    <g>
+      <polygon class="cls-1" points="329.79 800.92 1366.27 800.92 1036.48 1130.71 0 1130.71 0 659.58 329.79 329.79 329.79 800.92"/>
+      <polygon class="cls-1" points="1696.06 0 1696.06 471.13 1366.27 800.92 1366.27 329.79 329.79 329.79 659.58 0 1696.06 0"/>
+    </g>
+  </g>
 </svg>
\ No newline at end of file
diff --git a/integration/intellij/src/main/resources/icons/sd_icon.png b/integration/intellij/src/main/resources/icons/sd_icon.png
deleted file mode 100644
index be928d45cfc..00000000000
--- a/integration/intellij/src/main/resources/icons/sd_icon.png
+++ /dev/null
diff --git a/integration/intellij/src/main/resources/icons/sd_icon.svg b/integration/intellij/src/main/resources/icons/sd_icon.svg
new file mode 100644
index 00000000000..aaffea9490a
--- /dev/null
+++ b/integration/intellij/src/main/resources/icons/sd_icon.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1696.06 1130.71">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #2e2f27;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <g id="Layer_1-2" data-name="Layer 1">
+    <g>
+      <polygon class="cls-1" points="329.79 800.92 1366.27 800.92 1036.48 1130.71 0 1130.71 0 659.58 329.79 329.79 329.79 800.92"/>
+      <polygon class="cls-1" points="1696.06 0 1696.06 471.13 1366.27 800.92 1366.27 329.79 329.79 329.79 659.58 0 1696.06 0"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file