From 22a6b13b22b47b2664530d1c58149776089b6a88 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 10 Jul 2026 23:02:38 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.11.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b27577f..0c217e2 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.11.2 runner.dialect = scala3 project.git = true maxColumn = 120 From 4489ef59cb25c9473f2747a314bc28919ce16bd8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 10 Jul 2026 23:02:41 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.11.2 Executed command: scalafmt --non-interactive --- build.sbt | 18 +++++++++--------- project/Dependencies.scala | 12 ++++-------- project/sbt-release.sbt | 2 +- src/main/scala/fr/davit/scout/Zeroconf.scala | 6 +++--- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/build.sbt b/build.sbt index 72e0d35..06d0e86 100644 --- a/build.sbt +++ b/build.sbt @@ -7,25 +7,25 @@ val username = "RustedBones" val repo = "scout" // for sbt-github-actions -ThisBuild / scalaVersion := "3.2.1" +ThisBuild / scalaVersion := "3.2.1" 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")), + startYear := Some(2020), + scmInfo := Some(ScmInfo(url(s"https://github.com/$username/$repo"), s"git@github.com:$username/$repo.git")), developers := List( Developer( id = s"$username", @@ -34,9 +34,9 @@ lazy val commonSettings = Defaults.itSettings ++ url = url(s"https://github.com/$username") ) ), - publishMavenStyle := true, + publishMavenStyle := true, Test / publishArtifact := false, - publishTo := { + publishTo := { val resolver = if (isSnapshot.value) { Opts.resolver.sonatypeSnapshots: @nowarn("cat=deprecation") } else { 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") diff --git a/src/main/scala/fr/davit/scout/Zeroconf.scala b/src/main/scala/fr/davit/scout/Zeroconf.scala index 82d9dca..36939ff 100644 --- a/src/main/scala/fr/davit/scout/Zeroconf.scala +++ b/src/main/scala/fr/davit/scout/Zeroconf.scala @@ -205,7 +205,7 @@ object Zeroconf: ): Stream[F, Unit] = def isServiceRequest(message: DnsMessage): Boolean = - val isQuery = message.header.`type` == DnsType.Query + val isQuery = message.header.`type` == DnsType.Query val isServiceQuestion = message.questions.exists { q => q.name == instance.service.show && q.`type` == DnsRecordType.PTR && @@ -263,7 +263,7 @@ object Zeroconf: val answers = List(ptr) val additionals = List(srv, txt) ++ as - val header = DnsHeader( + val header = DnsHeader( id = 0, `type` = DnsType.Response, opCode = DnsOpCode.StandardQuery, @@ -278,7 +278,7 @@ object Zeroconf: end serviceResponse val servers = for - itf <- interface.map(Stream.emit).getOrElse(networkInterfaces()) + itf <- interface.map(Stream.emit).getOrElse(networkInterfaces()) addresses <- Stream.eval { if instance.addresses.nonEmpty then Sync[F].pure(instance.addresses) // TODO filter if non reachable on itf ? else Sync[F].delay(itf.inetAddresses().filter(_.isSiteLocalAddress()).toScala(List)) From 56ee1eaf4b1176e824073cead52ba0193e0e4f1a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 10 Jul 2026 23:02:41 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.11.2' 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..f9332e4 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.11.2 +4489ef59cb25c9473f2747a314bc28919ce16bd8