Merge branch 'main' into update/scala-compiler-2.12.17

scala-steward · Oct 23, 2022 · 92ad6c5 · 92ad6c5
2 parents c9d63f1 + ee85c32
commit 92ad6c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.7.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -13,11 +13,6 @@ libraryDependencies ++= {
   else Seq("org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.0.0")
 }
 
-{
-  if (scalaJSVersion.startsWith("0.6.")) addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-sjs06" % "0.19.0")
-  else Seq(addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0"))
-}
-
 libraryDependencies ++= {
   if (scalaJSVersion.startsWith("0.6.")) Nil
   else Seq("org.scala-js" %% "scalajs-linker" % "1.0.1")
@@ -26,6 +21,6 @@ libraryDependencies ++= {
 addSbtPlugin("com.jsuereth"   % "sbt-pgp"         % "2.1.1")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype"    % "3.9.13")
 addSbtPlugin("com.dwijnand"   % "sbt-dynver"      % "4.1.1")
-addSbtPlugin("org.jetbrains"  % "sbt-idea-plugin" % "3.15.3")
+addSbtPlugin("org.jetbrains"  % "sbt-idea-plugin" % "3.17.9")
 addSbtPlugin("org.scalameta"  % "sbt-scalafmt"    % "2.4.5")
-addSbtPlugin("ch.epfl.scala"  % "sbt-scalafix"    % "0.10.2")
+addSbtPlugin("ch.epfl.scala"  % "sbt-scalafix"    % "0.10.4")