Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 3.8.5 #254

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.5
aefb690e8222c5cf74edc200028b061f679dfac7
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = 3.8.2
version = 3.8.5
runner.dialect = scala213source3
maxColumn = 120
43 changes: 23 additions & 20 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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")),
)
Expand All @@ -34,22 +33,23 @@ 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
// ThisBuild / githubWorkflowBuildPostamble := Seq(WorkflowStep.Run(
// 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 \"[email protected]\"",
"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 \"[email protected]\"",
"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")))

Expand All @@ -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")

Expand All @@ -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
}
}

Expand All @@ -102,7 +100,12 @@ ThisBuild / publishMavenStyle := true
sonatypeProjectHosting := Some(GitHubHosting("dimitarg", "weaver-test-extra", "[email protected]"))

developers := List(
Developer(id="dimitarg", name="Dimitar Georgiev", email="[email protected]", url=url("https://dimitarg.github.io/"))
Developer(
id = "dimitarg",
name = "Dimitar Georgiev",
email = "[email protected]",
url = url("https://dimitarg.github.io/")
)
)

releaseCrossBuild := true // true if you cross-build the project for multiple Scala versions
Expand Down
Loading