From deb5824398f5909ae3bc7526ee7a959189f2b74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=A2=83=E8=BF=B7=E7=A6=BB?= Date: Sun, 20 Jul 2025 13:06:23 +0800 Subject: [PATCH 1/2] update idea and scala 3.7 --- build.sbt | 16 ++++++++----- project/build.properties | 2 +- project/plugins.sbt | 2 +- src/main/resources/META-INF/plugin.xml | 8 ++++++- .../analyzer/util/SbtDependencyUtils.scala | 23 +++++++++---------- .../packagesearch/SbtDependencyModifier.scala | 4 ++-- .../SbtPossiblePlacesPanel.scala | 6 ++--- 7 files changed, 35 insertions(+), 26 deletions(-) diff --git a/build.sbt b/build.sbt index 5d5d354..3076913 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import org.jetbrains.sbtidea.Keys.* import org.jetbrains.sbtidea.verifier.FailureLevel -lazy val scala3Version = "3.6.4" +lazy val scala3Version = "3.7.1" lazy val logbackVersion = "1.5.18" lazy val graphvizVersion = "0.18.1" lazy val joorVersion = "0.9.15" @@ -12,8 +12,8 @@ lazy val jbAnnotVersion = "26.0.2" // https://youtrack.jetbrains.com/articles/IDEA-A-2100661679/IntelliJ-IDEA-2023.3-Latest-Builds // NOTE: Latest-Builds 233 -lazy val intellijVersion = "251.23536.34" -lazy val pluginVersion = s"0.7.0-$intellijVersion" +lazy val intellijVersion = "251.26927.53" +lazy val pluginVersion = s"0.7.1-$intellijVersion" ThisBuild / version := pluginVersion @@ -43,9 +43,12 @@ lazy val `sbt-dependency-analyzer` = (project in file(".")) scalaVersion := scala3Version, organization := "org.bitlap", scalacOptions ++= Seq( - "-deprecation", - "-Xfatal-warnings" - /** , "-rewrite", "-source:3.4-migration"* */ +// "-deprecation", +// "-Xfatal-warnings" + "-Ybackend-parallelism:16", // https://github.com/scala/scala3/pull/15392 +// "-nowarn", // during migration + "-rewrite", + "-source:3.7-migration" ), version := (ThisBuild / version).value, ThisBuild / intellijPluginName := "Sbt Dependency Analyzer", @@ -62,6 +65,7 @@ lazy val `sbt-dependency-analyzer` = (project in file(".")) offline = true, // forbid the verifier from reaching the internet failureLevels = Set(FailureLevel.COMPATIBILITY_PROBLEMS, FailureLevel.COMPATIBILITY_WARNINGS) ), + autoRemoveOldCachedIntelliJSDK := true, Global / intellijAttachSources := true, intellijPlugins ++= Seq("com.intellij.java", "com.intellij.java-i18n", "org.intellij.scala").map(_.toPlugin), Compile / unmanagedResourceDirectories += baseDirectory.value / "src" / "main" / "resources", diff --git a/project/build.properties b/project/build.properties index 3f1b698..0d08862 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.2 \ No newline at end of file +sbt.version=1.11.3 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index fbdb25c..5cdb485 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,6 +3,6 @@ ThisBuild / resolvers ++= Seq( "Sonatype OSS Releases" at "https://s01.oss.sonatype.org/content/repositories/releases" ) addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0") -addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "4.1.11") +addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "4.1.17") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") addSbtPlugin("org.bitlap" % "sbt-kotlin-plugin" % "4.0.1") diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 85a0aa3..a4c21f7 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -2,7 +2,7 @@ org.bitlap.sbtDependencyAnalyzer Sbt Dependency Analyzer - 0.7.0-251.23536.34 + 0.7.1-251.26927.53 Bitlap @@ -136,6 +136,12 @@ 0.7.1-251.26927.53 + + +

0.7.0-251.23536.34