compatibility with IJ 2024.2

AVSystem · Jun 10, 2024 · bf50317 · bf50317
1 parent 5379f77
commit bf50317
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,11 +1,12 @@
 import org.jetbrains.sbtidea.Keys._
 
-ThisBuild / scalaVersion := "2.13.10"
+ThisBuild / scalaVersion := "2.13.14"
 ThisBuild / intellijPluginName := "intellij-hocon"
-ThisBuild / intellijBuild := "241.8102.112"
+ThisBuild / intellijBuild := "242.14146.16"
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
 
 val junitInterfaceVersion = "0.11"
+val commonsTextVersion = "1.12.0"
 
 lazy val hocon = project.in(file(".")).enablePlugins(SbtIdeaPlugin).settings(
   version := "2024.1.99-SNAPSHOT",
@@ -22,6 +23,7 @@ lazy val hocon = project.in(file(".")).enablePlugins(SbtIdeaPlugin).settings(
   ideBasePackages := Seq("org.jetbrains.plugins.hocon"),
   intellijPlugins := Seq("com.intellij.properties", "com.intellij.java", "com.intellij.java-i18n").map(_.toPlugin),
   libraryDependencies ++= Seq(
+    "org.apache.commons" % "commons-text" % commonsTextVersion,
     "com.novocode" % "junit-interface" % junitInterfaceVersion % Test,
   ),
   packageLibraryMappings := Seq.empty, // allow scala-library

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.10.0
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -5,7 +5,7 @@
     <description>Standalone HOCON plugin for IntelliJ IDEA</description>
     <version>2024.1.99-SNAPSHOT</version>
     <vendor>Roman Janusz, AVSystem, JetBrains</vendor>
-    <idea-version since-build="241.0" until-build="250.0"/>
+    <idea-version since-build="242.0" until-build="250.0"/>
     <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.modules.lang</depends>
     <depends optional="true" config-file="hocon-java.xml">com.intellij.modules.java</depends>

diff --git a/src/org/jetbrains/plugins/hocon/package.scala b/src/org/jetbrains/plugins/hocon/package.scala
@@ -24,7 +24,7 @@ package object hocon extends AsJavaExtensions with AsScalaExtensions {
   type JMap[K, V] = java.util.Map[K, V]
 
   final val HoconIcon = AllIcons.FileTypes.Config
-  final val PropertyIcon = IconManager.getInstance.getIcon("/icons/property.svg", getClass)
+  final val PropertyIcon = IconManager.getInstance.getIcon("/icons/property.svg", getClass.getClassLoader)
 
   def notWhiteSpaceSibling(element: PsiElement)
     (sibling: PsiElement => PsiElement): PsiElement = {