Merge branch 'develop' into update/sbt-scalafmt-2.5.2

sbt · Nov 3, 2024 · 8d0e9a7 · 8d0e9a7
2 parents a098570 + e8f7550
commit 8d0e9a7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.7.17
+51ff6ed032bdebd73d089cc9ecf8f062b53bc07d
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.4
+version = 3.7.17
 maxColumn = 100
 project.git = true
 project.excludeFilters = [ /sbt-test/, /input_sources/, /contraband-scala/ ]

diff --git a/io/src/test/scala/sbt/internal/nio/FileTreeRepositorySpec.scala b/io/src/test/scala/sbt/internal/nio/FileTreeRepositorySpec.scala
@@ -211,8 +211,8 @@ class FileTreeRepositorySpec extends AnyFlatSpec with Matchers {
         c.ls(dir.toGlob / RecursiveGlob).toSet shouldBe (files ++ subdirs).toSet
       }
 
-    // This is failing on GitHub Action
-    /*
+      // This is failing on GitHub Action
+      /*
       withThread("file-deletion-thread") {
         subdirs.foreach(p => IO.delete(p.toFile))
       } {
@@ -221,7 +221,7 @@ class FileTreeRepositorySpec extends AnyFlatSpec with Matchers {
         }
         c.ls(dir.toGlob / AnyPath) shouldBe Symbol("empty")
       }
-     */
+       */
     }
   }
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,16 +2,16 @@ import sbt._
 import Keys._
 
 object Dependencies {
-  val scala212 = "2.12.18"
-  val scala213 = "2.13.12"
-  val scala3 = "3.3.1"
+  val scala212 = "2.12.20"
+  val scala213 = "2.13.15"
+  val scala3 = "3.3.4"
 
   val scalaCompiler = Def.setting {
     val v = if (scalaBinaryVersion.value == "3") scala213 else scalaVersion.value
     "org.scala-lang" % "scala-compiler" % v
   }
 
-  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.0"
-  val scalatest = "org.scalatest" %% "scalatest" % "3.2.16"
+  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.1"
+  val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
   val swovalFiles = "com.swoval" % "file-tree-views" % "2.1.12"
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
-addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
+addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
-addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.0")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
+addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.7.0")