From 87dea256e379fd1d73c66fbe70e72cd06abb5d69 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Thu, 19 May 2022 12:25:40 +0200 Subject: [PATCH 1/4] chore(deps): update munit to 0.7.29 in all tests --- src/sbt-test/scoverage/aggregate-disabled-module/build.sbt | 2 +- src/sbt-test/scoverage/aggregate-only/build.sbt | 2 +- src/sbt-test/scoverage/aggregate/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage/build.sbt | 2 +- src/sbt-test/scoverage/coverage-off/build.sbt | 2 +- src/sbt-test/scoverage/good-coverage/build.sbt | 2 +- src/sbt-test/scoverage/preserve-set/build.sbt | 2 +- src/sbt-test/scoverage/scalajs/build.sbt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt index 3cd2b444..96b53f6d 100644 --- a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt +++ b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt @@ -2,7 +2,7 @@ inThisBuild( List( organization := "org.scoverage", scalaVersion := "2.13.6", - libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test + libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test ) ) diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt index c2c6ed97..1562553d 100644 --- a/src/sbt-test/scoverage/aggregate-only/build.sbt +++ b/src/sbt-test/scoverage/aggregate-only/build.sbt @@ -15,7 +15,7 @@ def module(name: String) = { .settings(commonSettings: _*) .settings( Keys.name := name, - libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test + libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test ) } diff --git a/src/sbt-test/scoverage/aggregate/build.sbt b/src/sbt-test/scoverage/aggregate/build.sbt index c2c6ed97..1562553d 100644 --- a/src/sbt-test/scoverage/aggregate/build.sbt +++ b/src/sbt-test/scoverage/aggregate/build.sbt @@ -15,7 +15,7 @@ def module(name: String) = { .settings(commonSettings: _*) .settings( Keys.name := name, - libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test + libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test ) } diff --git a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt index 56f70037..575c5b90 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimumBranchPerFile := 80 diff --git a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt index 9da543b4..b15693be 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimumStmtPerFile := 90 diff --git a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt index 748cf6e4..9fbe65eb 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimumBranchPerPackage := 80 diff --git a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt index 18176ee4..b93999ba 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimumStmtPerPackage := 80 diff --git a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt index 33b3c8d2..b56eb640 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimumBranchTotal := 80 diff --git a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt index 46ad59a2..691dcfcb 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimumStmtTotal := 80 diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt index 502f94a2..7ca08dcb 100644 --- a/src/sbt-test/scoverage/bad-coverage/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimum := 80 diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt index f24ad2a8..ce1d4439 100644 --- a/src/sbt-test/scoverage/coverage-off/build.sbt +++ b/src/sbt-test/scoverage/coverage-off/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimum := 80 coverageMinimumStmtTotal := 100 diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt index f24ad2a8..ce1d4439 100644 --- a/src/sbt-test/scoverage/good-coverage/build.sbt +++ b/src/sbt-test/scoverage/good-coverage/build.sbt @@ -2,7 +2,7 @@ version := "0.1" scalaVersion := "2.13.6" -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageMinimum := 80 coverageMinimumStmtTotal := 100 diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt index e4eb293e..6a410576 100644 --- a/src/sbt-test/scoverage/preserve-set/build.sbt +++ b/src/sbt-test/scoverage/preserve-set/build.sbt @@ -6,7 +6,7 @@ scalaVersion := "2.13.6" crossScalaVersions := Seq("2.13.6") -libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test +libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test val checkScalaVersion = inputKey[Unit]( "Input task to compare the value of scalaVersion setting with a given input." diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt index 4406129c..5e342188 100644 --- a/src/sbt-test/scoverage/scalajs/build.sbt +++ b/src/sbt-test/scoverage/scalajs/build.sbt @@ -8,7 +8,7 @@ lazy val cross = .crossType(CrossType.Full) .settings( scalaVersion := "2.13.6", - libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test + libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test ) lazy val crossJS = cross.js From a92e13706d465c8a5470d9def94f057cbdc27446 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Thu, 19 May 2022 12:26:02 +0200 Subject: [PATCH 2/4] chore(deps): update sbt to 1.6.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3161d214..c8fcab54 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 From acd78151ecf33c685458b7efcf2cd88dfbba7c31 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Thu, 19 May 2022 12:27:14 +0200 Subject: [PATCH 3/4] chore(deps): bump scalafmt to 3.5.4 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1fb59a51..5de2248a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.3.1" +version = "3.5.4" project.git = true runner.dialect = "scala213" From a13fb95af2162a9177ce58e2b81f5fb356ef1f21 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Thu, 19 May 2022 12:27:41 +0200 Subject: [PATCH 4/4] chore(deps): bump sbt-buildinfo to 0.11.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 153fde2b..19695c2e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")