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.3 #186

Open
wants to merge 3 commits into
base: main
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.3
dbe264a5e09341b429f2d423a018383a95f4bcc0
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.6.1
version = 3.8.3
runner.dialect = scala3
project.git = true
maxColumn = 120
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"[email protected]:$username/$repo.git")),
scmInfo := Some(ScmInfo(url(s"https://github.com/$username/$repo"), s"[email protected]:$username/$repo.git")),
developers := List(
Developer(
id = s"$username",
Expand All @@ -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) {
Expand Down
12 changes: 4 additions & 8 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -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"
}

}
2 changes: 1 addition & 1 deletion project/sbt-release.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
Loading