Update icons for new UI and build system

build.gradle.kts

@@ -5,9 +5,9 @@ fun properties(key: String) = providers.gradleProperty(key)
 fun environment(key: String) = providers.environmentVariable(key)
 
 plugins {
-    java
-    id("org.jetbrains.intellij") version "1.15.0"
-    id("org.jetbrains.changelog") version "2.1.2"
+    id("java") // Java support
+    alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
+    alias(libs.plugins.changelog) // Gradle Changelog Plugin
 }
 
 group = properties("pluginGroup").get()
@@ -17,6 +17,10 @@ repositories {
     mavenCentral()
 }
 
+dependencies {
+    implementation(libs.annotations)
+}
+
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))

gradle/libs.versions.toml

@@ -0,0 +1,20 @@
+[versions]
+# libraries
+annotations = "24.0.1"
+
+# plugins
+kotlin = "1.9.10"
+changelog = "2.2.0"
+gradleIntelliJPlugin = "1.16.0"
+qodana = "0.1.13"
+kover = "0.7.3"
+
+[libraries]
+annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
+
+[plugins]
+changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
+qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

resources/KeyPromoterXIconMappings.json

@@ -0,0 +1,8 @@
+{
+  "icons": {
+    "expui": {
+      "kpx.svg": "icons/kpx.svg",
+      "kpxToolwindow.svg": "icons/kpxToolwindow.svg"
+    }
+  }
+}

resources/META-INF/plugin.xml

@@ -30,7 +30,8 @@
         <postStartupActivity implementation="de.halirutan.keypromoterx.KeyPromoterXStartupNotification"/>
         <applicationService serviceImplementation="de.halirutan.keypromoterx.statistic.KeyPromoterStatistics"/>
         <applicationService serviceImplementation="de.halirutan.keypromoterx.KeyPromoterSettings"/>
-        <toolWindow id="Key Promoter X" anchor="right" icon="/de/halirutan/keypromoterx/icons/kpxToolwindow.svg"
+        <iconMapper mappingFile="KeyPromoterXIconMappings.json"/>
+        <toolWindow id="Key Promoter X" anchor="right" icon="de.halirutan.keypromoterx.KeyPromoterIcons.KP_TOOL_WINDOW"
                     factoryClass="de.halirutan.keypromoterx.KeyPromoterToolWindowFactory"/>
         <applicationConfigurable id="keyPromoterConfiguration" displayName="Key Promoter X"
                                  instance="de.halirutan.keypromoterx.KeyPromoterConfiguration" groupId="tools"/>

resources/icons/expui/icon-robots.txt

@@ -0,0 +1 @@
+skip: *

settings.gradle

@@ -0,0 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+}
+
+rootProject.name = "Key Promoter X"

src/de/halirutan/keypromoterx/KeyPromoterBundle.java

@@ -38,13 +38,13 @@
 public class KeyPromoterBundle {
 
   @NonNls
-  private static final String PATH_TO_BUNDLE = "de.halirutan.keypromoterx.messages.KeyPromoterBundle";
+  private static final String PATH_TO_BUNDLE = "messages.KeyPromoterBundle";
   private static Reference<ResourceBundle> ourBundle;
 
   private KeyPromoterBundle() {
   }
 
-  public static String message(@NotNull @PropertyKey(resourceBundle = "de.halirutan.keypromoterx.messages.KeyPromoterBundle") String key, @NotNull Object... params) {
+  public static String message(@NotNull @PropertyKey(resourceBundle = "messages.KeyPromoterBundle") String key, @NotNull Object... params) {
     return AbstractBundle.message(getBundle(), key, params);
   }
 

src/de/halirutan/keypromoterx/KeyPromoterIcons.java

@@ -22,7 +22,7 @@
  * @author Patrick Scheibe.
  */
 public interface KeyPromoterIcons {
-    Icon KP_ICON = IconLoader.getIcon("/de/halirutan/keypromoterx/icons/kpx.svg", KeyPromoterIcons.class);
+    Icon KP_ICON = IconLoader.getIcon("icons/kpx.svg", KeyPromoterIcons.class);
     @SuppressWarnings("unused")
-    Icon KP_TOOL_WINDOW = IconLoader.getIcon("/de/halirutan/keypromoterx/icons/kpxToolwindow.svg", KeyPromoterIcons.class);
+    Icon KP_TOOL_WINDOW = IconLoader.getIcon("icons/kpxToolwindow.svg", KeyPromoterIcons.class);
 }