diff --git a/build.gradle.kts b/build.gradle.kts
index eb55087..442801d 100644
--- a/build.gradle.kts
+++ b/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))
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..45a05ba
--- /dev/null
+++ b/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" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e1bef7e..e411586 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/resources/KeyPromoterXIconMappings.json b/resources/KeyPromoterXIconMappings.json
new file mode 100644
index 0000000..9ed7412
--- /dev/null
+++ b/resources/KeyPromoterXIconMappings.json
@@ -0,0 +1,8 @@
+{
+ "icons": {
+ "expui": {
+ "kpx.svg": "icons/kpx.svg",
+ "kpxToolwindow.svg": "icons/kpxToolwindow.svg"
+ }
+ }
+}
\ No newline at end of file
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 06b3d7d..e958d9d 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -30,7 +30,8 @@
-
+
diff --git a/resources/de/halirutan/keypromoterx/icons/kpxToolwindow.svg b/resources/de/halirutan/keypromoterx/icons/kpxToolwindow.svg
deleted file mode 100644
index fb8422b..0000000
--- a/resources/de/halirutan/keypromoterx/icons/kpxToolwindow.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/resources/de/halirutan/keypromoterx/icons/kpxToolwindow_dark.svg b/resources/de/halirutan/keypromoterx/icons/kpxToolwindow_dark.svg
deleted file mode 100644
index 568999a..0000000
--- a/resources/de/halirutan/keypromoterx/icons/kpxToolwindow_dark.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/resources/icons/expui/icon-robots.txt b/resources/icons/expui/icon-robots.txt
new file mode 100644
index 0000000..f216014
--- /dev/null
+++ b/resources/icons/expui/icon-robots.txt
@@ -0,0 +1 @@
+skip: *
\ No newline at end of file
diff --git a/resources/de/halirutan/keypromoterx/icons/kpx.svg b/resources/icons/expui/kpx.svg
similarity index 100%
rename from resources/de/halirutan/keypromoterx/icons/kpx.svg
rename to resources/icons/expui/kpx.svg
diff --git a/resources/icons/expui/kpxToolwindow.svg b/resources/icons/expui/kpxToolwindow.svg
new file mode 100644
index 0000000..c27e7f0
--- /dev/null
+++ b/resources/icons/expui/kpxToolwindow.svg
@@ -0,0 +1,10 @@
+
diff --git a/resources/icons/expui/kpxToolwindow_dark.svg b/resources/icons/expui/kpxToolwindow_dark.svg
new file mode 100644
index 0000000..79a26ae
--- /dev/null
+++ b/resources/icons/expui/kpxToolwindow_dark.svg
@@ -0,0 +1,10 @@
+
diff --git a/resources/de/halirutan/keypromoterx/icons/kpx_dark.svg b/resources/icons/expui/kpx_dark.svg
similarity index 100%
rename from resources/de/halirutan/keypromoterx/icons/kpx_dark.svg
rename to resources/icons/expui/kpx_dark.svg
diff --git a/resources/icons/kpx.svg b/resources/icons/kpx.svg
new file mode 100644
index 0000000..9f41a00
--- /dev/null
+++ b/resources/icons/kpx.svg
@@ -0,0 +1,15 @@
+
diff --git a/resources/icons/kpxToolwindow.svg b/resources/icons/kpxToolwindow.svg
new file mode 100644
index 0000000..91b5742
--- /dev/null
+++ b/resources/icons/kpxToolwindow.svg
@@ -0,0 +1,10 @@
+
diff --git a/resources/icons/kpxToolwindow_dark.svg b/resources/icons/kpxToolwindow_dark.svg
new file mode 100644
index 0000000..e3be43c
--- /dev/null
+++ b/resources/icons/kpxToolwindow_dark.svg
@@ -0,0 +1,10 @@
+
diff --git a/resources/icons/kpx_dark.svg b/resources/icons/kpx_dark.svg
new file mode 100644
index 0000000..8f78d1f
--- /dev/null
+++ b/resources/icons/kpx_dark.svg
@@ -0,0 +1,15 @@
+
diff --git a/resources/de/halirutan/keypromoterx/messages/KeyPromoterBundle.properties b/resources/messages/KeyPromoterBundle.properties
similarity index 100%
rename from resources/de/halirutan/keypromoterx/messages/KeyPromoterBundle.properties
rename to resources/messages/KeyPromoterBundle.properties
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..cb96314
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,5 @@
+plugins {
+ id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+}
+
+rootProject.name = "Key Promoter X"
\ No newline at end of file
diff --git a/src/de/halirutan/keypromoterx/KeyPromoterBundle.java b/src/de/halirutan/keypromoterx/KeyPromoterBundle.java
index e4ed638..2cc477a 100644
--- a/src/de/halirutan/keypromoterx/KeyPromoterBundle.java
+++ b/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 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);
}
diff --git a/src/de/halirutan/keypromoterx/KeyPromoterIcons.java b/src/de/halirutan/keypromoterx/KeyPromoterIcons.java
index ed46416..4682166 100644
--- a/src/de/halirutan/keypromoterx/KeyPromoterIcons.java
+++ b/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);
}