Merged branch idea243.release into idea243.x

JetBrains · Dec 10, 2024 · acaefb2 · acaefb2
2 parents 2f028cf + 7fc4cf1
commit acaefb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/project/dependencies.scala b/project/dependencies.scala
@@ -15,7 +15,7 @@ object Versions {
   val zincVersion = "1.10.3"
 
   // ATTENTION: check the comment in `Common.newProjectWithKotlin` when updating this version
-  val intellijVersion = "243.22562.59"
+  val intellijVersion = "243.22562.145"
 
   def isNightlyIntellijVersion: Boolean = intellijVersion.count(_ == '.') == 1
 

diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/internal/ScalaDynamicPluginManager.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/internal/ScalaDynamicPluginManager.scala
@@ -5,6 +5,7 @@ import com.intellij.openapi.application.ApplicationManager
 import org.jetbrains.plugins.scala.components.ScalaPluginVersionVerifier
 
 import java.util.concurrent.atomic.AtomicBoolean
+import scala.annotation.nowarn
 
 class ScalaDynamicPluginManager extends DynamicPluginListener {
   override def checkUnloadPlugin(pluginDescriptor: IdeaPluginDescriptor): Unit = {
@@ -31,7 +32,7 @@ class ScalaDynamicPluginManager extends DynamicPluginListener {
     }
 
     if (pluginDescriptor.getPluginId == ScalaPluginVersionVerifier.scalaPluginId) {
-      throw new CannotUnloadPluginException("Dynamically unloading the JetBrains Scala plugin is not supported yet")
+      throw new CannotUnloadPluginException("Dynamically unloading the JetBrains Scala plugin is not supported yet"): @nowarn("cat=deprecation")
     }
   }