From 9fffa0476da0fbbda79d7e07149f490c4f4ffee2 Mon Sep 17 00:00:00 2001
From: Elior <heliosaian@gmail.com>
Date: Sat, 27 Jul 2024 17:19:18 +0300
Subject: [PATCH 1/3] chore(gradle): migrate to gradle v2

---
 .idea/compiler.xml        |   3 +
 .idea/gradle.xml          |   6 +-
 .idea/jarRepositories.xml |  27 +++++-
 .idea/misc.xml            |   5 +-
 .idea/modules.xml         |   3 +
 .idea/workspace.xml       | 133 +++++++++++++++++++++--------
 build.gradle.kts          | 172 +++++++++++++++++---------------------
 gradle.properties         |  10 +--
 gradle/libs.versions.toml |  12 +--
 9 files changed, 218 insertions(+), 153 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8d822ee..de48a44 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,9 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="1.8">
+      <module name="Image_Icon_Viewer" target="17" />
+      <module name="Image_Icon_Viewer.main" target="17" />
+      <module name="Image_Icon_Viewer.test" target="17" />
       <module name="imageicon" target="14" />
     </bytecodeTargetLevel>
   </component>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9054f7d..42e39a7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,9 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="/usr/local/Cellar/gradle/6.5/libexec" />
+        <option name="gradleJvm" value="jbr-17 (3)" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -14,5 +13,6 @@
         </option>
       </GradleProjectSettings>
     </option>
+    <option name="parallelModelFetch" value="true" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 1ddacec..637bab7 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -46,5 +46,30 @@
       <option name="name" value="BintrayJCenter" />
       <option name="url" value="https://jcenter.bintray.com/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="JetBrains Marketplace Repository" />
+      <option name="name" value="JetBrains Marketplace Repository" />
+      <option name="url" value="https://cache-redirector.jetbrains.com/plugins.jetbrains.com/maven" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Gradle Central Plugin Repository" />
+      <option name="name" value="Gradle Central Plugin Repository" />
+      <option name="url" value="https://plugins.gradle.org/m2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="IntelliJ Platform Dependencies Repository" />
+      <option name="name" value="IntelliJ Platform Dependencies Repository" />
+      <option name="url" value="https://cache-redirector.jetbrains.com/intellij-dependencies" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$USER_HOME$/.m2/repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="IntelliJ Repository (Releases)" />
+      <option name="name" value="IntelliJ Repository (Releases)" />
+      <option name="url" value="https://cache-redirector.jetbrains.com/www.jetbrains.com/intellij-repository/releases" />
+    </remote-repository>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6599a54..43334f6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="14" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21_PREVIEW" project-jdk-name="jbr-17 (3)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="ch.raffael.plugins.idea.runpopup.RunConfigurationUseTracker">
@@ -39,4 +38,4 @@
       <setting name="state" value="2" />
     </Base>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7ab29ce..bc48f06 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,9 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/Image-Icon-Viewer.iml" filepath="$PROJECT_DIR$/.idea/Image-Icon-Viewer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Image_Icon_Viewer.iml" filepath="$PROJECT_DIR$/.idea/modules/Image_Icon_Viewer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Image_Icon_Viewer.main.iml" filepath="$PROJECT_DIR$/.idea/modules/Image_Icon_Viewer.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Image_Icon_Viewer.test.iml" filepath="$PROJECT_DIR$/.idea/modules/Image_Icon_Viewer.test.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 60d586a..0980351 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,9 +22,18 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="255ae0c0-64f7-4e90-bf37-69c1f9e48f3d" name="Default Changelist" comment="supprt for 2024.1">
+    <list default="true" id="255ae0c0-64f7-4e90-bf37-69c1f9e48f3d" name="Default Changelist" comment="chore(package): support for 2024.1">
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/docs/CHANGELOG.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/CHANGELOG.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gradle/libs.versions.toml" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/libs.versions.toml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -73,13 +82,7 @@
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="Image Icon Viewer" type="f1a62948:ProjectNode" />
                 <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="build" type="c8890929:TasksNode$1" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="Image Icon Viewer" type="f1a62948:ProjectNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="verification" type="c8890929:TasksNode$1" />
+                <item name="intellij platform" type="c8890929:TasksNode$1" />
               </path>
             </expand>
             <select />
@@ -109,6 +112,12 @@
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;mallowigi&quot;
+  }
+}</component>
   <component name="GitSEFilterConfiguration">
     <file-type-list>
       <filtered-out-file-type name="LOCAL_BRANCH" />
@@ -120,6 +129,15 @@
   <component name="GitToolBoxStore">
     <option name="projectConfigVersion" value="5" />
   </component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;git@github.com:mallowigi/Image-Icon-Viewer.git&quot;,
+    &quot;accountId&quot;: &quot;88cd475f-4a52-4372-a138-80e8ea9bd2b9&quot;
+  }
+}</component>
+  <component name="GoLibraries">
+    <option name="indexEntireGoPath" value="true" />
+  </component>
   <component name="IRenRenameHistory">
     <option name="rememberedNames">
       <collection />
@@ -132,6 +150,7 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="/opt/homebrew/bin/php" />
   <component name="ProblemsViewState">
     <option name="selectedIndex" value="2" />
   </component>
@@ -150,28 +169,41 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Gradle.Image-Icon-Viewer [publishPlugin].executor": "Run",
-    "Gradle.Image-Icon-Viewer [runIde].executor": "Run",
-    "Gradle.Image-Icon-Viewer [setupDependencies].executor": "Run",
-    "Project.color": "444a20",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SONARLINT_PRECOMMIT_ANALYSIS": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "master",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "/Users/eliorboukhobza/projects/Image-Icon-Viewer",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "preferences.sourceCode.Kotlin",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Gradle.Image-Icon-Viewer [buildPlugin].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Image-Icon-Viewer [publishPlugin].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Image-Icon-Viewer [runIde].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.Image-Icon-Viewer [setupDependencies].executor&quot;: &quot;Run&quot;,
+    &quot;Project.color&quot;: &quot;444a20&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
+    &quot;SONARLINT_PRECOMMIT_ANALYSIS&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
+    &quot;ignore.preview.features.used&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/eliorboukhobza/projects/Image-Icon-Viewer&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  },
+  &quot;keyToStringList&quot;: {
+    &quot;kotlin-gradle-user-dirs&quot;: [
+      &quot;/Users/eliorboukhobza/.gradle&quot;
+    ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
@@ -185,7 +217,7 @@
       <recent name="$PROJECT_DIR$/src/main/java" />
     </key>
   </component>
-  <component name="RunManager" selected="Gradle.Image-Icon-Viewer [publishPlugin]">
+  <component name="RunManager" selected="Gradle.Image-Icon-Viewer [runIde] (1)">
     <configuration name="Image-Icon-Viewer [buildPlugin]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -268,7 +300,7 @@
       <RunAsTest>false</RunAsTest>
       <method v="2" />
     </configuration>
-    <configuration name="Image-Icon-Viewer [publishPlugin]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="Image-Icon-Viewer [publishPlugin]" type="GradleRunConfiguration" factoryName="Gradle">
       <ExternalSystemSettings>
         <option name="env">
           <map>
@@ -295,6 +327,28 @@
       <RunAsTest>false</RunAsTest>
       <method v="2" />
     </configuration>
+    <configuration name="Image-Icon-Viewer [runIde] (1)" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value="runIde" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>false</RunAsTest>
+      <method v="2" />
+    </configuration>
     <configuration name="Image-Icon-Viewer [runIde]" type="GradleRunConfiguration" factoryName="Gradle">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -338,15 +392,16 @@
     <list>
       <item itemvalue="Gradle.Image-Icon-Viewer [detekt]" />
       <item itemvalue="Gradle.Image-Icon-Viewer [runIde]" />
+      <item itemvalue="Gradle.Image-Icon-Viewer [publishPlugin]" />
+      <item itemvalue="Gradle.Image-Icon-Viewer [runIde] (1)" />
       <item itemvalue="Gradle.Image-Icon-Viewer [build]" />
       <item itemvalue="Gradle.Image-Icon-Viewer [buildPlugin]" />
       <item itemvalue="Gradle.Image-Icon-Viewer [ktlintFormat]" />
-      <item itemvalue="Gradle.Image-Icon-Viewer [publishPlugin]" />
       <item itemvalue="Gradle.Image-Icon-Viewer [runPluginVerifier]" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Gradle.Image-Icon-Viewer [publishPlugin]" />
+        <item itemvalue="Gradle.Image-Icon-Viewer [runIde] (1)" />
         <item itemvalue="Gradle.Image-Icon-Viewer [buildPlugin]" />
         <item itemvalue="Gradle.Image-Icon-Viewer [build]" />
         <item itemvalue="Gradle.Image-Icon-Viewer [ktlintFormat]" />
@@ -357,8 +412,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-js-predefined-1d06a55b98c1-fd6de256fdba-JavaScript-IU-241.8102.112" />
-        <option value="jdk-17.0.10-corretto-17.0.10-5b172459f563-52bcd064" />
+        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.18034.62" />
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.18034.62" />
       </set>
     </attachedChunks>
   </component>
@@ -394,6 +449,7 @@
       <workItem from="1632846725973" duration="735000" />
       <workItem from="1654289534486" duration="739000" />
       <workItem from="1654290305066" duration="2200000" />
+      <workItem from="1706891304545" duration="12000" />
     </task>
     <task id="LOCAL-00001" summary="chore(project): upgrade deps, fix changelog, add linters">
       <created>1632492159492</created>
@@ -502,9 +558,14 @@
     <MESSAGE value="remove &quot;image should be square&quot;" />
     <MESSAGE value="support for AS" />
     <MESSAGE value="supprt for 2024.1" />
-    <option name="LAST_COMMIT_MESSAGE" value="supprt for 2024.1" />
+    <MESSAGE value="chore(package): support for 2024.1" />
+    <option name="LAST_COMMIT_MESSAGE" value="chore(package): support for 2024.1" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
+  <component name="VgoProject">
+    <integration-enabled>false</integration-enabled>
+    <settings-migrated>true</settings-migrated>
+  </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
     <select />
diff --git a/build.gradle.kts b/build.gradle.kts
index 382cec5..c3e1592 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,7 +28,7 @@ import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-fun properties(key: String) = project.findProperty(key).toString()
+fun properties(key: String) = providers.gradleProperty(key).get()
 
 fun environment(key: String) = providers.environmentVariable(key)
 
@@ -42,35 +42,40 @@ plugins {
   alias(libs.plugins.kotlin)
   alias(libs.plugins.gradleIntelliJPlugin)
   alias(libs.plugins.changelog)
-  alias(libs.plugins.qodana)
   alias(libs.plugins.detekt)
   alias(libs.plugins.ktlint)
-  alias(libs.plugins.kover)
 }
 
-group = properties("pluginGroup")
-version = properties("pluginVersion")
+// Import variables from gradle.properties file
+val pluginGroup: String by project
+val pluginName: String by project
+val pluginVersion: String by project
+val pluginSinceBuild: String by project
+val pluginUntilBuild: String by project
+val pluginVerifierIdeVersions: String by project
+
+val platformType: String by project
+val platformVersion: String by project
+val platformPlugins: String by project
+val platformDownloadSources: String by project
+
+group = pluginGroup
+version = pluginVersion
+
 val depsTwelveMonkeys = properties("depsTwelveMonkeys")
 
 // Configure project's dependencies
 repositories {
   mavenCentral()
-  maven(url = "https://dl.bintray.com/jetbrains/intellij-plugin-service")
-  maven(url = "https://maven-central.storage-download.googleapis.com/repos/central/data/")
-  maven(url = "https://www.jetbrains.com/intellij-repository/releases")
-  maven(url = "https://www.jetbrains.com/intellij-repository/snapshots")
-}
+  mavenLocal()
+  gradlePluginPortal()
 
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
+  intellijPlatform {
+    defaultRepositories()
+    jetbrainsRuntime()
   }
 }
 
-kotlin {
-  jvmToolchain(17)
-}
-
 dependencies {
   detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.4")
   implementation("com.twelvemonkeys.imageio:imageio-core:$depsTwelveMonkeys")
@@ -84,34 +89,58 @@ dependencies {
   implementation("com.twelvemonkeys.imageio:imageio-pnm:$depsTwelveMonkeys")
   implementation("com.twelvemonkeys.imageio:imageio-tga:$depsTwelveMonkeys")
   implementation("com.twelvemonkeys.imageio:imageio-bmp:$depsTwelveMonkeys")
+
+  intellijPlatform {
+    intellijIdeaUltimate(platformVersion, useInstaller = false)
+    instrumentationTools()
+    pluginVerifier()
+    zipSigner()
+  }
 }
 
-// Configure gradle-intellij-plugin plugin.
-// Read more: https://github.com/JetBrains/gradle-intellij-plugin
-intellij {
-  pluginName.set(properties("pluginName"))
-  version.set(properties("platformVersion"))
-  type.set(properties("platformType"))
-  downloadSources.set(true)
-  instrumentCode.set(true)
-  updateSinceUntilBuild.set(true)
-//  localPath.set(properties("idePath"))
-
-  // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-//    plugins.set(
-//        listOf(
-//            "java",
-//            "com.intellij.CloudConfig",
-//            "Git4Idea",
-//        )
-//    )
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(17))
+  }
+}
+
+kotlin {
+  jvmToolchain(17)
+}
+
+intellijPlatform {
+  pluginConfiguration {
+    id = pluginGroup
+    name = pluginName
+    version = pluginVersion
+
+    ideaVersion {
+      sinceBuild = pluginSinceBuild
+      untilBuild = pluginUntilBuild
+    }
+
+    // changeNotes = provider {
+    //   markdownToHTML(File("./docs/RELEASE-NOTES.md").readText())
+    // }
+  }
+
+  publishing {
+    token = environment("PUBLISH_TOKEN")
+    channels = listOf(pluginVersion.split('-').getOrElse(1) { "default" }.split('.').first())
+  }
+
+  signing {
+    certificateChain = environment("CERTIFICATE_CHAIN")
+    privateKey = environment("PRIVATE_KEY")
+    password = environment("PRIVATE_KEY_PASSWORD")
+  }
 }
 
 // Configure gradle-changelog-plugin plugin.
 // Read more: https://github.com/JetBrains/gradle-changelog-plugin
 changelog {
   path.set("${project.projectDir}/docs/CHANGELOG.md")
-  version.set(properties("pluginVersion"))
+  version.set(pluginVersion)
   header.set(provider { version.get() })
   itemPrefix.set("-")
   keepUnreleasedSection.set(true)
@@ -129,73 +158,22 @@ detekt {
 }
 
 tasks {
-  wrapper {
-    gradleVersion = properties("gradleVersion")
+  withType<JavaCompile> {
+    sourceCompatibility = "17"
+    targetCompatibility = "17"
+    options.compilerArgs = listOf("-Xlint:deprecation", "-Xlint:unchecked")
   }
 
-  properties("javaVersion").let {
-    // Set the compatibility versions to 1.8
-    withType<JavaCompile> {
-      sourceCompatibility = it
-      targetCompatibility = it
-    }
-    withType<KotlinCompile> {
-      kotlinOptions.jvmTarget = it
-      kotlinOptions.freeCompilerArgs += listOf("-Xskip-prerelease-check", "-Xjvm-default=all")
-    }
+  withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = "17"
   }
 
   withType<Detekt> {
-    jvmTarget = properties("javaVersion")
-    reports.xml.required = true
-  }
-
-  withType<Copy> {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-  }
-
-  sourceSets {
-    main {
-      java.srcDirs("src/main/java")
-      resources.srcDirs("src/main/resources")
-    }
-  }
-
-  patchPluginXml {
-    version = properties("pluginVersion")
-    sinceBuild = properties("pluginSinceBuild")
-    untilBuild = properties("pluginUntilBuild")
-
-    // Get the latest available change notes from the changelog file
-    changeNotes = changelog.renderItem(changelog.getLatest(), Changelog.OutputType.HTML)
+    jvmTarget = "17"
   }
 
-  runPluginVerifier {
-    ideVersions.set(properties("pluginVerifierIdeVersions").split(',').map { it.trim() }.toList())
-  }
-
-  buildSearchableOptions {
-    enabled = false
-  }
-
-//  runIde {
-//    jvmArgs = properties("jvmArgs").split("")
-//    systemProperty("jb.service.configuration.url", properties("salesUrl"))
-//  }
-
-  signPlugin {
-    certificateChain = environment("CERTIFICATE_CHAIN")
-    privateKey = environment("PRIVATE_KEY")
-    password = environment("PRIVATE_KEY_PASSWORD")
-  }
-
-  publishPlugin {
-    token = environment("PUBLISH_TOKEN")
-    channels = listOf(properties("pluginVersion").split('-').getOrElse(1) { "default" }.split('.').first())
-  }
-
-  runIde {
-    ideDir = fileProperties("idePath")
+  wrapper {
+    gradleVersion = properties("gradleVersion")
   }
 
   register("markdownToHtml") {
diff --git a/gradle.properties b/gradle.properties
index 06af768..6d20a5e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,8 +21,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-gradleVersion=7.4
-depsTwelveMonkeys=3.10.1
+gradleVersion=8.9
+depsTwelveMonkeys=3.11.0
 javaVersion=17
 
 # IntelliJ Platform Artifacts Repositories
@@ -48,14 +48,14 @@ pluginGroup=com.mallowigi.imageicon
 # Plugin name
 pluginName=Image Icon Viewer
 # Since build
-pluginSinceBuild=231.0000
+pluginSinceBuild=242.0000
 # Until build
-pluginUntilBuild=251.*
+pluginUntilBuild=261.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
 pluginVerifierIdeVersions=2023.1
 # Plugin version
-pluginVersion=14.0.0
+pluginVersion=15.0.0
 # Password
 publishPassword=
 # Token
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c6f8aa3..e06d725 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,12 +3,10 @@
 annotations = "24.1.0"
 
 # plugins
-kotlin = "1.9.22"
+kotlin = "1.9.23"
 changelog = "2.2.0"
-gradleIntelliJPlugin = "1.17.0"
-qodana = "2023.2.1"
-kover = "0.7.5"
-detekt = "1.23.4"
+gradleIntelliJPlugin = "2.0.0-rc2"
+detekt = "1.23.6"
 ktlint = "12.1.0"
 
 [libraries]
@@ -16,9 +14,7 @@ annotations = { group = "org.jetbrains", name = "annotations", version.ref = "an
 
 [plugins]
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
-gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij.platform", 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" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }

From 3d481a5478d0cb17178976d6da3fd10ceab0fc06 Mon Sep 17 00:00:00 2001
From: Elior <heliosaian@gmail.com>
Date: Sun, 5 Jan 2025 09:10:34 +0200
Subject: [PATCH 2/3] Add File-Based Index for Image Icon Caching

Introduce `ImageIconIndex` to optimize icon retrieval by caching image icons using IntelliJ's File-Based Indexing API. This improves performance by reducing redundant image processing and streamlines access to image-based icons in the project.
---
 .../imageicon/ImageConverterFactory.kt        |  28 +++--
 .../com/mallowigi/imageicon/ImageIconIndex.kt | 119 ++++++++++++++++++
 .../mallowigi/imageicon/ImageIconProvider.kt  |  51 +++-----
 src/main/resources/META-INF/plugin.xml        |   5 +-
 4 files changed, 156 insertions(+), 47 deletions(-)
 create mode 100644 src/main/java/com/mallowigi/imageicon/ImageIconIndex.kt

diff --git a/src/main/java/com/mallowigi/imageicon/ImageConverterFactory.kt b/src/main/java/com/mallowigi/imageicon/ImageConverterFactory.kt
index 07ae1d4..d3e9346 100644
--- a/src/main/java/com/mallowigi/imageicon/ImageConverterFactory.kt
+++ b/src/main/java/com/mallowigi/imageicon/ImageConverterFactory.kt
@@ -28,21 +28,23 @@ import com.mallowigi.imageicon.converters.ExtendedImageConverter
 import com.mallowigi.imageicon.converters.ImageToIconConverter
 import com.mallowigi.imageicon.converters.RegularImageConverter
 import com.mallowigi.imageicon.converters.SVGImageConverter
-import java.util.Collections
+import java.util.*
 
 object ImageConverterFactory {
-  private val CONVERTERS = Collections.unmodifiableSet(
-    Sets.newHashSet(
-      RegularImageConverter(),
-      SVGImageConverter(),
-      ExtendedImageConverter()
+    val SUPPORTED_EXTENSIONS: Set<String> = setOf("svg", "jpg", "jpeg", "png", "gif", "bmp", "wbmp", "ico", "icns")
+
+    private val CONVERTERS = Collections.unmodifiableSet(
+        Sets.newHashSet(
+            RegularImageConverter(),
+            SVGImageConverter(),
+            ExtendedImageConverter()
+        )
     )
-  )
 
-  fun create(fileName: String?): ImageToIconConverter? {
-    val first = CONVERTERS.stream()
-      .filter { converter: ImageToIconConverter? -> converter!!.isAccepted(fileName) }
-      .findFirst()
-    return first.orElse(null)
-  }
+    fun create(fileName: String?): ImageToIconConverter? {
+        val first = CONVERTERS.stream()
+            .filter { converter: ImageToIconConverter? -> converter!!.isAccepted(fileName) }
+            .findFirst()
+        return first.orElse(null)
+    }
 }
diff --git a/src/main/java/com/mallowigi/imageicon/ImageIconIndex.kt b/src/main/java/com/mallowigi/imageicon/ImageIconIndex.kt
new file mode 100644
index 0000000..c29d6eb
--- /dev/null
+++ b/src/main/java/com/mallowigi/imageicon/ImageIconIndex.kt
@@ -0,0 +1,119 @@
+package com.mallowigi.imageicon
+
+import com.intellij.openapi.diagnostic.thisLogger
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.util.indexing.*
+import com.intellij.util.io.DataExternalizer
+import com.intellij.util.io.EnumeratorStringDescriptor
+import com.intellij.util.io.KeyDescriptor
+import java.awt.image.BufferedImage
+import java.io.*
+import java.util.*
+import javax.imageio.ImageIO.read
+import javax.imageio.ImageIO.write
+import javax.swing.Icon
+import javax.swing.ImageIcon
+
+class ImageIconIndex : FileBasedIndexExtension<String, Icon>() {
+    private val myIndexer: DataIndexer<String, Icon, FileContent> = ImageIconIndexer()
+
+    private val myValueExternalizer: DataExternalizer<Icon> = object : DataExternalizer<Icon> {
+        override fun save(out: DataOutput, value: Icon) {
+            if (value is ImageIcon && value.image != null) {
+                val outputStream = ByteArrayOutputStream()
+                try {
+                    // Cast value.image to BufferedImage (required for ImageIO)
+                    val bufferedImage = value.image as? BufferedImage
+                        ?: throw IOException("Icon's image is not a BufferedImage")
+
+                    // Write the image as PNG into the outputStream
+                    write(bufferedImage, "PNG", outputStream)
+
+                    // Convert the image bytes to a byte array
+                    val imageBytes = outputStream.toByteArray()
+
+                    // Write the byte array length first
+                    out.writeInt(imageBytes.size)
+
+                    // Write the actual bytes
+                    out.write(imageBytes)
+                } catch (e: IOException) {
+                    throw IOException("Failed to serialize the Icon", e)
+                } finally {
+                    outputStream.close()
+                }
+            } else {
+                throw UnsupportedOperationException("Only ImageIcon with BufferedImage is supported for serialization")
+            }
+        }
+
+        override fun read(input: DataInput): Icon {
+            val size = input.readInt() // Read the length of the byte array
+
+            // Read the image bytes
+            val imageBytes = ByteArray(size)
+            input.readFully(imageBytes)
+
+            // Convert the byte array back to a BufferedImage
+            val inputStream = ByteArrayInputStream(imageBytes)
+            val bufferedImage = read(inputStream)
+                ?: throw IOException("Failed to deserialize Icon image")
+
+            return ImageIcon(bufferedImage)
+        }
+    }
+
+    private val myInputFilter = FileBasedIndex.InputFilter { file: VirtualFile ->
+        isValidImagePath(file) && file.extension in ImageConverterFactory.SUPPORTED_EXTENSIONS
+    }
+
+    override fun getName(): ID<String, Icon> = NAME
+
+    override fun getInputFilter(): FileBasedIndex.InputFilter = myInputFilter
+
+    override fun dependsOnFileContent(): Boolean = false
+
+    override fun getIndexer(): DataIndexer<String, Icon, FileContent> = myIndexer
+
+    override fun getKeyDescriptor(): KeyDescriptor<String> = EnumeratorStringDescriptor.INSTANCE
+
+    override fun getValueExternalizer(): DataExternalizer<Icon> = myValueExternalizer
+
+    override fun getVersion(): Int = VERSION
+
+    internal class ImageIconIndexer : DataIndexer<String, Icon, FileContent> {
+        override fun map(inputData: FileContent): MutableMap<String, Icon> {
+            // val project = inputData.psiFile.project
+            // if (DumbService.isDumb(project)) return Collections.emptyMap()
+
+            val file = inputData.file
+            when {
+                !isValidImagePath(file)                                       -> return Collections.emptyMap()
+                file.isDirectory                                              -> return Collections.emptyMap()
+                file.extension !in ImageConverterFactory.SUPPORTED_EXTENSIONS -> return Collections.emptyMap()
+                else                                                          -> {
+                    val converter = ImageConverterFactory.create(file.name) ?: return Collections.emptyMap()
+
+                    val icon: Icon? = try {
+                        converter.convert(file, file.canonicalPath)
+                    } catch (e: IOException) {
+                        thisLogger().warn(e.message)
+                        null
+                    }
+
+                    return icon?.let { mutableMapOf(file.path to it) } ?: Collections.emptyMap()
+                }
+            }
+        }
+    }
+
+    companion object {
+        val NAME = ID.create<String, Icon>("com.mallowigi.imageicon.imageIndex")
+        const val VERSION = 1
+
+        private fun isValidImagePath(virtualFile: VirtualFile): Boolean {
+            val canonicalPath = virtualFile.canonicalFile?.canonicalPath
+            return canonicalPath != null && !canonicalPath.contains(".jar")
+        }
+    }
+}
diff --git a/src/main/java/com/mallowigi/imageicon/ImageIconProvider.kt b/src/main/java/com/mallowigi/imageicon/ImageIconProvider.kt
index 8073293..5d91d01 100644
--- a/src/main/java/com/mallowigi/imageicon/ImageIconProvider.kt
+++ b/src/main/java/com/mallowigi/imageicon/ImageIconProvider.kt
@@ -24,43 +24,30 @@
 package com.mallowigi.imageicon
 
 import com.intellij.ide.IconProvider
-import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.DumbAware
 import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiFileSystemItem
-import java.io.IOException
-import java.util.Objects
+import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.util.indexing.FileBasedIndex
 import javax.swing.Icon
 
 class ImageIconProvider : IconProvider(), DumbAware {
-  override fun getIcon(element: PsiElement, flags: Int): Icon? {
-    val containingFile = element.containingFile
-    if (isValidImagePath(containingFile)) {
-      val canonicalFile = Objects.requireNonNull(containingFile.virtualFile.canonicalFile)!!
-      val fileName = containingFile.name
-      val converter = ImageConverterFactory.create(fileName)
-      if (converter != null) {
-        try {
-          return converter.convert(canonicalFile, canonicalFile.canonicalPath)
-        } catch (e: IOException) {
-          LOG.warn(e.message)
-        }
-      }
-    }
-    return null
-  }
+    override fun getIcon(element: PsiElement, flags: Int): Icon? {
+        val fileBasedIndex = FileBasedIndex.getInstance()
+        var icon: Icon? = null
+        val project = element.project
+        val file = element.containingFile?.virtualFile ?: return null
 
-  companion object {
-    private val LOG = Logger.getInstance(ImageIconProvider::class.java)
-    private fun isValidImagePath(containingFile: PsiFileSystemItem?): Boolean {
-      return when {
-        containingFile == null                                                      -> false
-        containingFile.virtualFile == null                                          -> false
-        containingFile.virtualFile.canonicalFile == null                            -> false
-        containingFile.virtualFile.canonicalFile!!.canonicalPath == null            -> false
-        containingFile.virtualFile.canonicalFile!!.canonicalPath!!.contains(".jar") -> false
-        else                                                                        -> true
-      }
+        fileBasedIndex.processValues(
+            /* indexId = */ ImageIconIndex.NAME,
+            /* dataKey = */ file.path,
+            /* inFile = */ null,
+            /* processor = */ { _, value ->
+                icon = value
+                false
+            },
+            /* filter = */ GlobalSearchScope.projectScope(project)
+        )
+        return icon
     }
-  }
+
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index f20e4bd..7eefbfc 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -30,9 +30,9 @@
 
     <description><![CDATA[
         <h1>Image Icon Viewer</h1>
-        <br />
+        <br/>
         <h2>Preview project images right inside the Project View or Tabs.</h2>
-        <br />
+        <br/>
         <p>This is particularly helpful when working with icons, as it gives you a preview without needing to open the
             file.</p>
         ]]></description>
@@ -45,6 +45,7 @@
 
     <extensions defaultExtensionNs="com.intellij">
         <iconProvider implementation="com.mallowigi.imageicon.ImageIconProvider"/>
+        <fileBasedIndex implementation="com.mallowigi.imageicon.ImageIconIndex" id="ImageIconIndex"/>
     </extensions>
 
     <change-notes>

From 8bb4312e28f16707af03e1ff030464d6bc8c9b42 Mon Sep 17 00:00:00 2001
From: Elior <heliosaian@gmail.com>
Date: Sun, 5 Jan 2025 09:46:54 +0200
Subject: [PATCH 3/3] Refactor icon handling to use Base64 encoding.

Replaced `Icon` serialization with `Base64` string representation for image data, simplifying storage and retrieval. This change improves compatibility and reduces complexity in the `ImageIconIndex` and related classes. Additionally, restricted supported extensions to `SVG` for better focus and performance.
---
 .../imageicon/ImageConverterFactory.kt        |  2 +-
 .../com/mallowigi/imageicon/ImageIconIndex.kt | 95 +++++++------------
 .../mallowigi/imageicon/ImageIconProvider.kt  | 15 ++-
 3 files changed, 48 insertions(+), 64 deletions(-)

diff --git a/src/main/java/com/mallowigi/imageicon/ImageConverterFactory.kt b/src/main/java/com/mallowigi/imageicon/ImageConverterFactory.kt
index d3e9346..0841170 100644
--- a/src/main/java/com/mallowigi/imageicon/ImageConverterFactory.kt
+++ b/src/main/java/com/mallowigi/imageicon/ImageConverterFactory.kt
@@ -31,7 +31,7 @@ import com.mallowigi.imageicon.converters.SVGImageConverter
 import java.util.*
 
 object ImageConverterFactory {
-    val SUPPORTED_EXTENSIONS: Set<String> = setOf("svg", "jpg", "jpeg", "png", "gif", "bmp", "wbmp", "ico", "icns")
+    val SUPPORTED_EXTENSIONS: Set<String> = setOf("svg")
 
     private val CONVERTERS = Collections.unmodifiableSet(
         Sets.newHashSet(
diff --git a/src/main/java/com/mallowigi/imageicon/ImageIconIndex.kt b/src/main/java/com/mallowigi/imageicon/ImageIconIndex.kt
index c29d6eb..904dfe8 100644
--- a/src/main/java/com/mallowigi/imageicon/ImageIconIndex.kt
+++ b/src/main/java/com/mallowigi/imageicon/ImageIconIndex.kt
@@ -6,60 +6,33 @@ import com.intellij.util.indexing.*
 import com.intellij.util.io.DataExternalizer
 import com.intellij.util.io.EnumeratorStringDescriptor
 import com.intellij.util.io.KeyDescriptor
-import java.awt.image.BufferedImage
-import java.io.*
+import java.io.DataInput
+import java.io.DataOutput
+import java.io.IOException
+import java.nio.charset.StandardCharsets
 import java.util.*
-import javax.imageio.ImageIO.read
-import javax.imageio.ImageIO.write
-import javax.swing.Icon
-import javax.swing.ImageIcon
-
-class ImageIconIndex : FileBasedIndexExtension<String, Icon>() {
-    private val myIndexer: DataIndexer<String, Icon, FileContent> = ImageIconIndexer()
-
-    private val myValueExternalizer: DataExternalizer<Icon> = object : DataExternalizer<Icon> {
-        override fun save(out: DataOutput, value: Icon) {
-            if (value is ImageIcon && value.image != null) {
-                val outputStream = ByteArrayOutputStream()
-                try {
-                    // Cast value.image to BufferedImage (required for ImageIO)
-                    val bufferedImage = value.image as? BufferedImage
-                        ?: throw IOException("Icon's image is not a BufferedImage")
-
-                    // Write the image as PNG into the outputStream
-                    write(bufferedImage, "PNG", outputStream)
-
-                    // Convert the image bytes to a byte array
-                    val imageBytes = outputStream.toByteArray()
-
-                    // Write the byte array length first
-                    out.writeInt(imageBytes.size)
-
-                    // Write the actual bytes
-                    out.write(imageBytes)
-                } catch (e: IOException) {
-                    throw IOException("Failed to serialize the Icon", e)
-                } finally {
-                    outputStream.close()
-                }
-            } else {
-                throw UnsupportedOperationException("Only ImageIcon with BufferedImage is supported for serialization")
-            }
-        }
 
-        override fun read(input: DataInput): Icon {
-            val size = input.readInt() // Read the length of the byte array
-
-            // Read the image bytes
-            val imageBytes = ByteArray(size)
-            input.readFully(imageBytes)
-
-            // Convert the byte array back to a BufferedImage
-            val inputStream = ByteArrayInputStream(imageBytes)
-            val bufferedImage = read(inputStream)
-                ?: throw IOException("Failed to deserialize Icon image")
+class ImageIconIndex : FileBasedIndexExtension<String, String>() {
+    private val myIndexer: DataIndexer<String, String, FileContent> = ImageIconIndexer()
+
+    private val myValueExternalizer: DataExternalizer<String> = object : DataExternalizer<String> {
+        override fun save(out: DataOutput, value: String) {
+            // Convert string to bytes
+            val bytes = value.toByteArray(StandardCharsets.UTF_8)
+            // Write length of byte array
+            out.writeInt(bytes.size)
+            // Write byte array
+            out.write(bytes)
+        }
 
-            return ImageIcon(bufferedImage)
+        override fun read(input: DataInput): String {
+            // Read length of byte array
+            val length = input.readInt()
+            // Read the bytes
+            val bytes = ByteArray(length)
+            input.readFully(bytes)
+            // Convert back to a string
+            return String(bytes, StandardCharsets.UTF_8)
         }
     }
 
@@ -67,22 +40,22 @@ class ImageIconIndex : FileBasedIndexExtension<String, Icon>() {
         isValidImagePath(file) && file.extension in ImageConverterFactory.SUPPORTED_EXTENSIONS
     }
 
-    override fun getName(): ID<String, Icon> = NAME
+    override fun getName(): ID<String, String> = NAME
 
     override fun getInputFilter(): FileBasedIndex.InputFilter = myInputFilter
 
     override fun dependsOnFileContent(): Boolean = false
 
-    override fun getIndexer(): DataIndexer<String, Icon, FileContent> = myIndexer
+    override fun getIndexer(): DataIndexer<String, String, FileContent> = myIndexer
 
     override fun getKeyDescriptor(): KeyDescriptor<String> = EnumeratorStringDescriptor.INSTANCE
 
-    override fun getValueExternalizer(): DataExternalizer<Icon> = myValueExternalizer
+    override fun getValueExternalizer(): DataExternalizer<String> = myValueExternalizer
 
     override fun getVersion(): Int = VERSION
 
-    internal class ImageIconIndexer : DataIndexer<String, Icon, FileContent> {
-        override fun map(inputData: FileContent): MutableMap<String, Icon> {
+    internal class ImageIconIndexer : DataIndexer<String, String, FileContent> {
+        override fun map(inputData: FileContent): MutableMap<String, String> {
             // val project = inputData.psiFile.project
             // if (DumbService.isDumb(project)) return Collections.emptyMap()
 
@@ -94,21 +67,23 @@ class ImageIconIndex : FileBasedIndexExtension<String, Icon>() {
                 else                                                          -> {
                     val converter = ImageConverterFactory.create(file.name) ?: return Collections.emptyMap()
 
-                    val icon: Icon? = try {
-                        converter.convert(file, file.canonicalPath)
+                    val base64: String? = try {
+                        val imageWrapper = converter.getImageWrapper(file) ?: return Collections.emptyMap()
+                        converter.toBase64(imageWrapper)
                     } catch (e: IOException) {
                         thisLogger().warn(e.message)
                         null
                     }
 
-                    return icon?.let { mutableMapOf(file.path to it) } ?: Collections.emptyMap()
+                    return base64?.let { mutableMapOf(file.path to it) } ?: Collections.emptyMap()
                 }
             }
         }
     }
 
+    @Suppress("CompanionObjectInExtension")
     companion object {
-        val NAME = ID.create<String, Icon>("com.mallowigi.imageicon.imageIndex")
+        val NAME = ID.create<String, String>("com.mallowigi.imageicon.imageIndex")
         const val VERSION = 1
 
         private fun isValidImagePath(virtualFile: VirtualFile): Boolean {
diff --git a/src/main/java/com/mallowigi/imageicon/ImageIconProvider.kt b/src/main/java/com/mallowigi/imageicon/ImageIconProvider.kt
index 5d91d01..f3e7422 100644
--- a/src/main/java/com/mallowigi/imageicon/ImageIconProvider.kt
+++ b/src/main/java/com/mallowigi/imageicon/ImageIconProvider.kt
@@ -27,13 +27,16 @@ import com.intellij.ide.IconProvider
 import com.intellij.openapi.project.DumbAware
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.util.IconUtil
 import com.intellij.util.indexing.FileBasedIndex
+import com.mallowigi.imageicon.converters.SVGImageConverter
+import com.mallowigi.imageicon.core.IconType
 import javax.swing.Icon
 
 class ImageIconProvider : IconProvider(), DumbAware {
     override fun getIcon(element: PsiElement, flags: Int): Icon? {
         val fileBasedIndex = FileBasedIndex.getInstance()
-        var icon: Icon? = null
+        var base64: String? = null
         val project = element.project
         val file = element.containingFile?.virtualFile ?: return null
 
@@ -42,12 +45,18 @@ class ImageIconProvider : IconProvider(), DumbAware {
             /* dataKey = */ file.path,
             /* inFile = */ null,
             /* processor = */ { _, value ->
-                icon = value
+                base64 = value
                 false
             },
             /* filter = */ GlobalSearchScope.projectScope(project)
         )
-        return icon
+
+        if (base64 != null) {
+            val converter = SVGImageConverter()
+            val fromBase64 = converter.fromBase64(base64, IconType.SVG, file, true) ?: return null
+            return IconUtil.createImageIcon(fromBase64.image)
+        }
+        return null
     }
 
 }