From ac3218c6dc2fc297dd67d5cbf02a0cf41470492a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:13:38 +0000 Subject: [PATCH 01/13] Update sbt-buildinfo to 0.13.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4953b733..2413b0d0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,5 +3,5 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") 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") From da8f3fe4521b29d9c30dbc58da540f6cb30f3cfa Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:13:52 +0000 Subject: [PATCH 02/13] Update sbt-dynver to 5.1.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4953b733..77afbdf0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") +addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") From 3db9b13301bf24a8daa33e10cbcd2c37426a2ef4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:14:07 +0000 Subject: [PATCH 03/13] Update sbt-pgp to 2.3.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4953b733..b1558755 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3") From f94289ad143c12e52dac27409fe9177c9e685aca Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:14:20 +0000 Subject: [PATCH 04/13] Update sbt-mima-plugin to 1.1.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4953b733..bb11ada2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ 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.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From fcadbce71030f4a26bb9a25f1a3c94481215767e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:14:34 +0000 Subject: [PATCH 05/13] Update scala-compiler, scala-library to 2.12.20 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c09a9434..904294a3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,7 @@ import sbt._ import Keys._ object Dependencies { - val scala212 = "2.12.18" + val scala212 = "2.12.20" val scala213 = "2.13.12" val scala3 = "3.3.1" From 46bc88022dc676dd0ff0803a3f1e028c901b1972 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:14:50 +0000 Subject: [PATCH 06/13] Update scala-compiler, scala-library to 2.13.15 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c09a9434..0aae1789 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,7 +3,7 @@ import Keys._ object Dependencies { val scala212 = "2.12.18" - val scala213 = "2.13.12" + val scala213 = "2.13.15" val scala3 = "3.3.1" val scalaCompiler = Def.setting { From 5bad316d48d82c78323d5bd58548e61ce8361d0e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:15:00 +0000 Subject: [PATCH 07/13] Update scala3-library to 3.3.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c09a9434..898c4129 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import Keys._ object Dependencies { val scala212 = "2.12.18" val scala213 = "2.13.12" - val scala3 = "3.3.1" + val scala3 = "3.3.4" val scalaCompiler = Def.setting { val v = if (scalaBinaryVersion.value == "3") scala213 else scalaVersion.value From 248d0cd1c8492bec4129a921e695b5f06c647320 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:15:32 +0000 Subject: [PATCH 08/13] Update sbt-contraband to 0.7.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4953b733..5ae41c89 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,6 +2,6 @@ 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("org.scalameta" % "sbt-scalafmt" % "2.5.0") -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.7.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From 8dd6c8e7745a1d9e1d54effaddfd6247c67076ec Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:15:51 +0000 Subject: [PATCH 09/13] Update scalacheck to 1.17.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c09a9434..2c3432f8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ object Dependencies { "org.scala-lang" % "scala-compiler" % v } - val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.0" + val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.1" val scalatest = "org.scalatest" %% "scalatest" % "3.2.16" val swovalFiles = "com.swoval" % "file-tree-views" % "2.1.12" } From 326da7a8144525348f30a79c02b686cdcf50643f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:16:22 +0000 Subject: [PATCH 10/13] Update scalafmt-core to 3.7.17 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 8ae105bc..5636c671 100644 --- 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/ ] From 51ff6ed032bdebd73d089cc9ecf8f062b53bc07d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:16:43 +0000 Subject: [PATCH 11/13] Reformat with scalafmt 3.7.17 Executed command: scalafmt --non-interactive --- .../scala/sbt/internal/nio/FileTreeRepositorySpec.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/io/src/test/scala/sbt/internal/nio/FileTreeRepositorySpec.scala b/io/src/test/scala/sbt/internal/nio/FileTreeRepositorySpec.scala index 59874b89..0344476f 100644 --- 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") } - */ + */ } } From f5bb4b0333a65c8f6c73508a73dc0919b0898c6f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:16:43 +0000 Subject: [PATCH 12/13] Add 'Reformat with scalafmt 3.7.17' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..ae6d753e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.17 +51ff6ed032bdebd73d089cc9ecf8f062b53bc07d From 644c6197b826b3c62f6d190b754f4968813eb782 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:16:53 +0000 Subject: [PATCH 13/13] Update scalatest to 3.2.19 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c09a9434..f07d2e7e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,6 +12,6 @@ object Dependencies { } val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.0" - val scalatest = "org.scalatest" %% "scalatest" % "3.2.16" + val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" val swovalFiles = "com.swoval" % "file-tree-views" % "2.1.12" }