Update scalafmt-core to 3.7.14 (#250)

* Update scalafmt-core to 3.7.14 * Reformat with scalafmt 3.7.14 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.7.14' to .git-blame-ignore-revs
andyglow · Oct 18, 2023 · 457f7e2 · 457f7e2
1 parent acb4046
commit 457f7e2
Show file tree

Hide file tree

Showing 19 changed files with 215 additions and 193 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.7.14
+5322317e378d136bf4d876be5d68dd5c9a637fa2
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.5.9"
+version = "3.7.14"
 runner.dialect = scala212
 maxColumn = 120
 project.git = true

diff --git a/build.sbt b/build.sbt
@@ -1,105 +1,93 @@
-import CustomGithubActions.{aggregateCC, generateCC, uploadCC}
-import sbt.*
-import sbt.Keys.*
-import sbt.Defaults.*
-import xerial.sbt.Sonatype.*
-import ReleaseTransformations.*
+import CustomGithubActions.*
+import CustomGithubActions.aggregateCC
+import CustomGithubActions.generateCC
+import CustomGithubActions.uploadCC
 import Dependencies.*
+import ReleaseTransformations.*
 import ScalaVer.*
-import CustomGithubActions.*
-
 import java.net.URL
-
+import sbt.*
+import sbt.Defaults.*
+import sbt.Keys.*
+import xerial.sbt.Sonatype.*
 
 // https://github.com/xerial/sbt-sonatype/issues/71
-ThisBuild / publishTo  := sonatypePublishTo.value
+ThisBuild / publishTo                           := sonatypePublishTo.value
 ThisBuild / githubWorkflowTargetPaths           := Paths.Ignore(List("**.md"))
 ThisBuild / githubWorkflowScalaVersions         := ScalaVer.values.map(_.full)
 ThisBuild / githubWorkflowPublishTargetBranches := Seq()
 ThisBuild / githubWorkflowJavaVersions          := Seq(JavaSpec.temurin("11"))
 ThisBuild / githubWorkflowBuildPostamble        := Seq(generateCC, aggregateCC, uploadCC)
 
 lazy val commons = ScalaVer.settings ++ Seq(
-
-    organization := "com.github.andyglow",
-
-    homepage := Some(new URL("http://github.com/andyglow/websocket-scala-client")),
-
-    startYear := Some(2019),
-
-    organizationName := "andyglow",
-
-    scalacOptions := CompilerOptions(scalaV.value),
-
-    Compile / doc / scalacOptions ++= Seq(
-        "-groups",
-        "-implicits",
-        "-no-link-warnings"),
-
-    licenses := Seq(("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))),
-
-    sonatypeProfileName := "com.github.andyglow",
-
-    publishMavenStyle := true,
-
-    sonatypeProjectHosting := Some(
-        GitHubHosting(
-            "andyglow",
-            "websocket-scala-client",
-            "[email protected]")),
-
-    scmInfo := Some(
-        ScmInfo(
-            url("https://github.com/andyglow/websocket-scala-client"),
-            "scm:[email protected]:andyglow/websocket-scala-client.git")),
-
-    developers := List(
-        Developer(
-            id    = "andyglow",
-            name  = "Andriy Onyshchuk",
-            email = "[email protected]",
-            url   = url("https://ua.linkedin.com/in/andyglow"))),
-
-    releaseCrossBuild := true,
-
-    releasePublishArtifactsAction := PgpKeys.publishSigned.value,
-
-    releaseProcess := Seq[ReleaseStep](
-        checkSnapshotDependencies,
-        inquireVersions,
-        runClean,
-        runTest,
-        setReleaseVersion,
-        commitReleaseVersion,
-        tagRelease,
-        ReleaseStep(action = Command.process("publishSigned", _), enableCrossBuild = true),
-        setNextVersion,
-        commitNextVersion,
-        ReleaseStep(action = Command.process("sonatypeReleaseAll", _), enableCrossBuild = true),
-        pushChanges),
-
-    libraryDependencies ++= Seq(
-        "org.scalatest" %% "scalatest" % "3.2.17" % Test,
-        "org.mockito" % "mockito-core" % "5.6.0" % Test
+  organization     := "com.github.andyglow",
+  homepage         := Some(new URL("http://github.com/andyglow/websocket-scala-client")),
+  startYear        := Some(2019),
+  organizationName := "andyglow",
+  scalacOptions    := CompilerOptions(scalaV.value),
+  Compile / doc / scalacOptions ++= Seq("-groups", "-implicits", "-no-link-warnings"),
+  licenses               := Seq(("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))),
+  sonatypeProfileName    := "com.github.andyglow",
+  publishMavenStyle      := true,
+  sonatypeProjectHosting := Some(GitHubHosting("andyglow", "websocket-scala-client", "[email protected]")),
+  scmInfo := Some(
+    ScmInfo(
+      url("https://github.com/andyglow/websocket-scala-client"),
+      "scm:[email protected]:andyglow/websocket-scala-client.git"
     )
+  ),
+  developers := List(
+    Developer(
+      id = "andyglow",
+      name = "Andriy Onyshchuk",
+      email = "[email protected]",
+      url = url("https://ua.linkedin.com/in/andyglow")
+    )
+  ),
+  releaseCrossBuild             := true,
+  releasePublishArtifactsAction := PgpKeys.publishSigned.value,
+  releaseProcess := Seq[ReleaseStep](
+    checkSnapshotDependencies,
+    inquireVersions,
+    runClean,
+    runTest,
+    setReleaseVersion,
+    commitReleaseVersion,
+    tagRelease,
+    ReleaseStep(action = Command.process("publishSigned", _), enableCrossBuild = true),
+    setNextVersion,
+    commitNextVersion,
+    ReleaseStep(action = Command.process("sonatypeReleaseAll", _), enableCrossBuild = true),
+    pushChanges
+  ),
+  libraryDependencies ++= Seq(
+    "org.scalatest" %% "scalatest"    % "3.2.17" % Test,
+    "org.mockito"    % "mockito-core" % "5.6.0"  % Test
+  )
 )
 
 resolvers ++= Seq("snapshots", "releases").flatMap(Resolver.sonatypeOssRepos)
 
 lazy val root = (project in file("."))
   .configs(Examples)
-  .settings(inConfig(Examples)(compileBase ++ compileSettings ++ Seq(
-    run     := Defaults.runTask(Examples / fullClasspath , run / mainClass, run / runner).evaluated,
-    runMain := Defaults.runMainTask(Examples / fullClasspath, run / runner).evaluated)))
   .settings(
-      commons,
-      name := "websocket-scala-client",
-      libraryDependencies ++= Seq(
-          nettyAll,
-          nettyHttp,
-          scalaStm,
-          slf4jApi,
-          slf4jSimple,
-          akkaHttp(scalaVersion.value).cross(CrossVersion.binary),
-          akkaStream(scalaVersion.value).cross(CrossVersion.binary)))
-
+    inConfig(Examples)(
+      compileBase ++ compileSettings ++ Seq(
+        run     := Defaults.runTask(Examples / fullClasspath, run / mainClass, run / runner).evaluated,
+        runMain := Defaults.runMainTask(Examples / fullClasspath, run / runner).evaluated
+      )
+    )
+  )
+  .settings(
+    commons,
+    name := "websocket-scala-client",
+    libraryDependencies ++= Seq(
+      nettyAll,
+      nettyHttp,
+      scalaStm,
+      slf4jApi,
+      slf4jSimple,
+      akkaHttp(scalaVersion.value).cross(CrossVersion.binary),
+      akkaStream(scalaVersion.value).cross(CrossVersion.binary)
+    )
+  )
diff --git a/project/CompilerOptions.scala b/project/CompilerOptions.scala
@@ -1,11 +1,6 @@
 object CompilerOptions {
 
-  private val base = Seq(
-    "-encoding", "UTF-8",
-    "-feature",
-    "-unchecked",
-    "-deprecation",
-    "-language:higherKinds")
+  private val base = Seq("-encoding", "UTF-8", "-feature", "-unchecked", "-deprecation", "-language:higherKinds")
 
   private val opts211 = base ++ Seq(
     "-Xfuture",
@@ -36,4 +31,4 @@ object CompilerOptions {
       case ScalaVer._300 => opts300
     }
   }
-}
+}
diff --git a/project/CustomGithubActions.scala b/project/CustomGithubActions.scala
@@ -1,4 +1,5 @@
-import sbtghactions.GenerativePlugin.autoImport.{UseRef, WorkflowStep}
+import sbtghactions.GenerativePlugin.autoImport.UseRef
+import sbtghactions.GenerativePlugin.autoImport.WorkflowStep
 
 object CustomGithubActions {
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,11 +6,11 @@ object Dependencies {
   val slf4jVersion = "2.0.9"
   val nettyVersion = "4.1.100.Final"
 
-  val nettyAll    = "io.netty"      % "netty-all"        % nettyVersion % Compile
-  val nettyHttp   = "io.netty"      % "netty-codec-http" % nettyVersion % Compile
-  val slf4jApi    = "org.slf4j"     % "slf4j-api"        % slf4jVersion % Compile
-  val slf4jSimple = "org.slf4j"     % "slf4j-simple"     % slf4jVersion % Examples
-  val scalaStm    = "org.scala-stm" %% "scala-stm"       % "0.11.1"     % Compile
+  val nettyAll    = "io.netty"       % "netty-all"        % nettyVersion % Compile
+  val nettyHttp   = "io.netty"       % "netty-codec-http" % nettyVersion % Compile
+  val slf4jApi    = "org.slf4j"      % "slf4j-api"        % slf4jVersion % Compile
+  val slf4jSimple = "org.slf4j"      % "slf4j-simple"     % slf4jVersion % Examples
+  val scalaStm    = "org.scala-stm" %% "scala-stm"        % "0.11.1"     % Compile
 
   object akkaHttp {
 

diff --git a/project/ScalaVer.scala b/project/ScalaVer.scala
@@ -1,6 +1,8 @@
-import sbt.Keys.{crossScalaVersions, scalaVersion}
+import sbt.Def
+import sbt.Keys.crossScalaVersions
+import sbt.Keys.scalaVersion
 import sbt.librarymanagement.CrossVersion
-import sbt.{Def, settingKey}
+import sbt.settingKey
 
 sealed abstract class ScalaVer(val full: String)
 
@@ -31,7 +33,8 @@ object ScalaVer {
   lazy val scalaV = settingKey[ScalaVer]("Current Scala Version")
 
   def settings: Seq[Def.Setting[? >: String & Seq[String] & ScalaVer <: Object]] = Seq(
-    scalaVersion        := (ScalaVer.fromEnv getOrElse ScalaVer.default).full,
-    crossScalaVersions  := ScalaVer.values.map(_.full),
-    scalaV              := ScalaVer.fromString(scalaVersion.value) getOrElse ScalaVer.default)
+    scalaVersion       := (ScalaVer.fromEnv getOrElse ScalaVer.default).full,
+    crossScalaVersions := ScalaVer.values.map(_.full),
+    scalaV             := ScalaVer.fromString(scalaVersion.value) getOrElse ScalaVer.default
+  )
 }
diff --git a/src/example/scala/BinaryEchoWebSocketOrg.scala b/src/example/scala/BinaryEchoWebSocketOrg.scala
@@ -1,7 +1,9 @@
-import java.nio.charset.Charset
-import com.github.andyglow.websocket.{WebsocketHandler, WebsocketClient}
-import io.netty.buffer.{Unpooled, ByteBuf}
 import com.github.andyglow.websocket._
+import com.github.andyglow.websocket.WebsocketClient
+import com.github.andyglow.websocket.WebsocketHandler
+import io.netty.buffer.ByteBuf
+import io.netty.buffer.Unpooled
+import java.nio.charset.Charset
 
 object BinaryEchoWebSocketOrg extends WaitForStop[ByteBuf] {
 

diff --git a/src/example/scala/SimplifiedTextEchoWebSocketOrg.scala b/src/example/scala/SimplifiedTextEchoWebSocketOrg.scala
@@ -4,10 +4,10 @@ object SimplifiedTextEchoWebSocketOrg extends WaitForStop[String] {
 
   val client = {
     val builder = WebsocketClient.Builder[String](stringUri) {
-      case "stop"         => logger.info(s"<<! stop"); done()
-      case str            => logger.info(s"<<| $str")
-    } onFailure {
-      case ex: Throwable  => logger.error(s"Error occurred.", ex)
+      case "stop" => logger.info(s"<<! stop"); done()
+      case str    => logger.info(s"<<| $str")
+    } onFailure { case ex: Throwable =>
+      logger.error(s"Error occurred.", ex)
     } onClose {
       logger.info(s"<<! connection closed"); done()
     }

diff --git a/src/example/scala/WaitForStop.scala b/src/example/scala/WaitForStop.scala
@@ -1,15 +1,16 @@
+import com.github.andyglow.websocket.Websocket
+import com.github.andyglow.websocket.WebsocketClient
 import com.github.andyglow.websocket.util.ServerAddressBuilder
-import com.github.andyglow.websocket.{Websocket, WebsocketClient}
 import org.slf4j.LoggerFactory
-
 import scala.concurrent._
-import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext.Implicits.global
-import scala.util.{Failure, Success}
+import scala.concurrent.duration._
+import scala.util.Failure
+import scala.util.Success
 
 trait WaitForStop[T] {
 
-  val host = "localhost:8080"
+  val host      = "localhost:8080"
   val binaryUri = ServerAddressBuilder(s"ws://$host/?encoding=binary")
   val stringUri = ServerAddressBuilder(s"ws://$host")
 
@@ -23,8 +24,8 @@ trait WaitForStop[T] {
   def run(): Unit
 
   def done(): Unit = {
-    socket.close andThen {
-      case _ => roundtrip.success(())
+    socket.close andThen { case _ =>
+      roundtrip.success(())
     }
   }
 

diff --git a/src/test/scala-2.11/com/github/andyglow/websocket/testserver/PlatformDependent.scala b/src/test/scala-2.11/com/github/andyglow/websocket/testserver/PlatformDependent.scala
@@ -2,19 +2,19 @@ package com.github.andyglow.websocket.testserver
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
+import akka.http.scaladsl.model.HttpRequest
+import akka.http.scaladsl.model.HttpResponse
 import akka.http.scaladsl.model.ws.UpgradeToWebSocket
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
 import akka.stream.Materializer
-
 import java.util.concurrent.Callable
 import scala.concurrent.Future
 
 trait PlatformDependent {
 
-  @inline def launchServer(
-    interface: String,
-    port: Int,
-    handler: HttpRequest => HttpResponse)(implicit system: ActorSystem, mat: Materializer): Future[Http.ServerBinding] = {
+  @inline def launchServer(interface: String, port: Int, handler: HttpRequest => HttpResponse)(implicit
+    system: ActorSystem,
+    mat: Materializer
+  ): Future[Http.ServerBinding] = {
 
     Http().bindAndHandleSync(handler, interface, port)
   }

diff --git a/src/test/scala-2.12/com/github/andyglow/websocket/testserver/PlatformDependent.scala b/src/test/scala-2.12/com/github/andyglow/websocket/testserver/PlatformDependent.scala
@@ -2,27 +2,29 @@ package com.github.andyglow.websocket.testserver
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
+import akka.http.scaladsl.model.AttributeKeys
+import akka.http.scaladsl.model.HttpRequest
+import akka.http.scaladsl.model.HttpResponse
 import akka.http.scaladsl.model.ws.WebSocketUpgrade
-import akka.http.scaladsl.model.{AttributeKeys, HttpRequest, HttpResponse}
 import akka.stream.Materializer
-
 import java.util.concurrent.Callable
 import scala.concurrent.Future
 
 trait PlatformDependent {
 
-  @inline def launchServer(
-    interface: String,
-    port: Int,
-    handler: HttpRequest => HttpResponse)(implicit system: ActorSystem, mat: Materializer): Future[Http.ServerBinding] = {
+  @inline def launchServer(interface: String, port: Int, handler: HttpRequest => HttpResponse)(implicit
+    system: ActorSystem,
+    mat: Materializer
+  ): Future[Http.ServerBinding] = {
 
     Http().newServerAt(interface, port).bindSync(handler)
   }
 
-  @inline def websocketAttribution(x: HttpRequest): Option[WebSocketUpgrade] = x.attribute(AttributeKeys.webSocketUpgrade)
+  @inline def websocketAttribution(x: HttpRequest): Option[WebSocketUpgrade] =
+    x.attribute(AttributeKeys.webSocketUpgrade)
 }
 
 object PlatformDependent {
 
   @inline def callable[T](fn: () => T): Callable[T] = () => fn()
-}
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Scala Steward: Reformat with scalafmt 3.7.14
		5322317e378d136bf4d876be5d68dd5c9a637fa2