From d4a632f028e313045f90e800cca9363f34b51552 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 14 Jan 2025 16:28:52 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.4 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 73f9e8e..f706a38 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = 3.8.2 +version = 3.8.4 runner.dialect = scala213source3 maxColumn = 120 From 160b38dd66c28f2668b5a319c210488debe73b8a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 14 Jan 2025 16:29:01 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.4 Executed command: scalafmt --non-interactive --- build.sbt | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/build.sbt b/build.sbt index 32aa488..0cc45d2 100644 --- a/build.sbt +++ b/build.sbt @@ -6,9 +6,9 @@ ThisBuild / organization := "io.github.dimitarg" ThisBuild / scalaVersion := "2.13.15" ThisBuild / crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4") -ThisBuild / githubWorkflowScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4") +ThisBuild / githubWorkflowScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4") -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21")) +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21")) ThisBuild / githubWorkflowBuild := Seq( WorkflowStep.Sbt( @@ -18,11 +18,10 @@ ThisBuild / githubWorkflowBuild := Seq( // scoverage plugin not yet supporting scala 2.13.15 // commands = List("coverage", "test"), commands = List("test"), - env = Map( - "HONEYCOMB_WRITE_KEY" -> "${{ secrets.HONEYCOMB_WRITE_KEY }}", + "HONEYCOMB_WRITE_KEY" -> "${{ secrets.HONEYCOMB_WRITE_KEY }}" ) - ), + ) // scoverage plugin not yet supporting scala 2.13.15 // WorkflowStep.Sbt(List("coverageReport")), ) @@ -34,7 +33,6 @@ ThisBuild / githubWorkflowEnv += "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PA ThisBuild / githubWorkflowTargetBranches := Seq("master") ThisBuild / githubWorkflowPublishTargetBranches += RefPredicate.Equals(Ref.Branch("master")) - ThisBuild / licenses += ("Apache-2.0", url("https://opensource.org/licenses/Apache-2.0")) // scoverage plugin not yet supporting scala 2.13.15 @@ -42,14 +40,16 @@ ThisBuild / licenses += ("Apache-2.0", url("https://opensource.org/licenses/Apac // commands = List("bash <(curl -s https://codecov.io/bash)") // )) -ThisBuild / githubWorkflowPublishPreamble := Seq(WorkflowStep.Run( - List( - "git config user.name \"Github Actions (dimitarg/weaver-test-extra)\"", - "git config user.email \"dimitar.georgiev.bg@gmail.com\"", - "gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 7A723A868B1FD65C8108ACAF00437AAD7A33298A", - "echo $PGP_SECRET | base64 --decode --ignore-garbage | gpg --batch --passphrase $PGP_PASSPHRASE --import" +ThisBuild / githubWorkflowPublishPreamble := Seq( + WorkflowStep.Run( + List( + "git config user.name \"Github Actions (dimitarg/weaver-test-extra)\"", + "git config user.email \"dimitar.georgiev.bg@gmail.com\"", + "gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 7A723A868B1FD65C8108ACAF00437AAD7A33298A", + "echo $PGP_SECRET | base64 --decode --ignore-garbage | gpg --batch --passphrase $PGP_PASSPHRASE --import" + ) ) -)) +) ThisBuild / githubWorkflowPublish := Seq(WorkflowStep.Sbt(List("release cross with-defaults"))) @@ -58,16 +58,14 @@ val weaverVersion = "0.8.4" val natchezVersion = "0.3.7" val fs2Version = "3.11.0" -libraryDependencies ++=Seq( +libraryDependencies ++= Seq( "com.disneystreaming" %% "weaver-scalacheck" % weaverVersion, "com.disneystreaming" %% "weaver-cats" % weaverVersion, "org.tpolecat" %% "natchez-core" % natchezVersion, - "org.tpolecat" %% "natchez-noop" % natchezVersion % "test", "org.tpolecat" %% "natchez-honeycomb" % natchezVersion % "test", - "co.fs2" %% "fs2-io" % fs2Version % "test", -) - + "co.fs2" %% "fs2-io" % fs2Version % "test" +) testFrameworks += new TestFramework("weaver.framework.CatsEffect") @@ -85,7 +83,7 @@ libraryDependencies ++= { ThisBuild / scalacOptions ++= { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12 | 13)) => Seq("-Xsource:3-cross", "-P:kind-projector:underscore-placeholders") - case _ => Nil + case _ => Nil } } @@ -102,7 +100,12 @@ ThisBuild / publishMavenStyle := true sonatypeProjectHosting := Some(GitHubHosting("dimitarg", "weaver-test-extra", "dimitar.georgiev.bg@gmail.com")) developers := List( - Developer(id="dimitarg", name="Dimitar Georgiev", email="dimitar.georgiev.bg@gmail.com", url=url("https://dimitarg.github.io/")) + Developer( + id = "dimitarg", + name = "Dimitar Georgiev", + email = "dimitar.georgiev.bg@gmail.com", + url = url("https://dimitarg.github.io/") + ) ) releaseCrossBuild := true // true if you cross-build the project for multiple Scala versions From 910b71ef17b00e387828c4db5a2252413e5c65b4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 14 Jan 2025 16:29:01 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.4' 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..0ab9ec8 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.4 +160b38dd66c28f2668b5a319c210488debe73b8a