diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b822402..f27911c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: CI on: push: branches: - - idea223.x - idea231.x - idea232.x - idea233.x + - idea241.x pull_request: jobs: diff --git a/README.md b/README.md index 02b683e..5c8f9a7 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,6 @@ A note about support: this plugin is maintained for the last two IntelliJ IDEA v To continue enjoying new features, please upgrade to the latest available IntellJ version! -**Currently supported**: - * 2023.3 (EAP) - * 2023.2 (current release) - * 2023.1 - -Previous versions are still available on the Marketplace. - ### Features The plugin has several powerful features for ZIO: diff --git a/build.sbt b/build.sbt index cf33632..19bbf9c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,13 +1,13 @@ import org.jetbrains.sbtidea.{AutoJbr, JbrPlatform} lazy val scala213 = "2.13.10" -lazy val scalaPluginVersion = "2023.3.19" -lazy val minorVersion = "3" +lazy val scalaPluginVersion = "2024.1.6" +lazy val minorVersion = "0" lazy val buildVersion = sys.env.getOrElse("ZIO_INTELLIJ_BUILD_NUMBER", minorVersion) -lazy val pluginVersion = s"2023.3.31.$buildVersion" +lazy val pluginVersion = s"2024.1.32.$buildVersion" ThisBuild / intellijPluginName := "zio-intellij" -ThisBuild / intellijBuild := "233" +ThisBuild / intellijBuild := "241" ThisBuild / jbrInfo := AutoJbr(explicitPlatform = Some(JbrPlatform.osx_aarch64)) Global / intellijAttachSources := true @@ -41,7 +41,7 @@ lazy val root = s"""What's new? ]]>""" ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4969715..79fccd0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.20.3") +addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.21.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 679894e..1be5e60 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -19,7 +19,7 @@ replaced-by-build - + org.intellij.scala com.intellij.modules.java diff --git a/src/main/scala/zio/intellij/utils/BackgroundTask.scala b/src/main/scala/zio/intellij/utils/BackgroundTask.scala index 9fec9c3..67e4ff5 100644 --- a/src/main/scala/zio/intellij/utils/BackgroundTask.scala +++ b/src/main/scala/zio/intellij/utils/BackgroundTask.scala @@ -13,7 +13,7 @@ object BackgroundTask { ): Future[A] = { val p = Promise[A]() - new Task.Backgroundable(project, title, true, PerformInBackgroundOption.ALWAYS_BACKGROUND) { + new Task.Backgroundable(project, title, true) { override def run(indicator: ProgressIndicator): Unit = p.complete(Try(f(indicator)))