From 84780576f30e27e6aa9340994945c03f64406be9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Jul 2024 01:05:54 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b27577f..37a5107 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.8.3 runner.dialect = scala3 project.git = true maxColumn = 120 From dbe264a5e09341b429f2d423a018383a95f4bcc0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Jul 2024 01:06:04 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.3 Executed command: scalafmt --non-interactive --- build.sbt | 12 ++++++------ project/Dependencies.scala | 12 ++++-------- project/sbt-release.sbt | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index 72e0d35..01a577f 100644 --- a/build.sbt +++ b/build.sbt @@ -12,20 +12,20 @@ ThisBuild / githubWorkflowBuild := Seq( WorkflowStep.Sbt(name = Some("Check project"), commands = List("scalafmtCheckAll", "headerCheckAll")), WorkflowStep.Sbt(name = Some("Build project"), commands = List("test", "IntegrationTest/test")) ) -ThisBuild / githubWorkflowTargetBranches := Seq("main") +ThisBuild / githubWorkflowTargetBranches := Seq("main") ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty lazy val commonSettings = Defaults.itSettings ++ headerSettings(Configurations.IntegrationTest) ++ inConfig(IntegrationTest)(ScalafmtPlugin.scalafmtConfigSettings) ++ Seq( - organization := "fr.davit", + organization := "fr.davit", organizationName := "Michel Davit", - scalaVersion := (ThisBuild / scalaVersion).value, - homepage := Some(url(s"https://github.com/$username/$repo")), + scalaVersion := (ThisBuild / scalaVersion).value, + homepage := Some(url(s"https://github.com/$username/$repo")), licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")), startYear := Some(2020), - scmInfo := Some(ScmInfo(url(s"https://github.com/$username/$repo"), s"git@github.com:$username/$repo.git")), + scmInfo := Some(ScmInfo(url(s"https://github.com/$username/$repo"), s"git@github.com:$username/$repo.git")), developers := List( Developer( id = s"$username", @@ -34,7 +34,7 @@ lazy val commonSettings = Defaults.itSettings ++ url = url(s"https://github.com/$username") ) ), - publishMavenStyle := true, + publishMavenStyle := true, Test / publishArtifact := false, publishTo := { val resolver = if (isSnapshot.value) { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f453440..af1e1bc 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,16 +1,12 @@ -import sbt._ +import sbt.* -object Dependencies { +object Dependencies: - object Versions { + object Versions: val MUnitCE3 = "1.0.7" val Taxonomy = "1.2.1" - } val Taxonomy = "fr.davit" %% "taxonomy-fs2" % Versions.Taxonomy - object Test { + object Test: val MUnitCE3 = "org.typelevel" %% "munit-cats-effect-3" % Versions.MUnitCE3 % "it,test" - } - -} diff --git a/project/sbt-release.sbt b/project/sbt-release.sbt index ef345f3..4ca2964 100644 --- a/project/sbt-release.sbt +++ b/project/sbt-release.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") \ No newline at end of file +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") From 5dfecd04151724fb3b64395e2919c7ed4533f988 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 30 Jul 2024 01:06:04 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.3' 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 0000000..43e1b46 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.3 +dbe264a5e09341b429f2d423a018383a95f4bcc0