Skip to content

Commit 6a5a3c2

Browse files
committed
Update scalafmt
1 parent 5462e75 commit 6a5a3c2

File tree

5 files changed

+54
-19
lines changed

5 files changed

+54
-19
lines changed

.scalafmt.conf

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,45 @@
1-
version = 3.0.3
1+
version = 3.5.2
2+
runner.dialect = scala213
23
style = defaultWithAlign
34
danglingParentheses.preset = true
45
indentOperator.preset = spray
6+
indentOperator.exemptScope = all
7+
align.preset = more
8+
align.tokens = [
9+
{
10+
code = "=>"
11+
owners = [{
12+
regex = "Case"
13+
}]
14+
},
15+
{
16+
code = "="
17+
owners = [{
18+
regex = "Defn\\."
19+
}]
20+
},
21+
{
22+
code = "->"
23+
},
24+
{
25+
code = "//"
26+
},
27+
{
28+
code = "%"
29+
owners = [{
30+
regex = "Term.ApplyInfix"
31+
}]
32+
},
33+
{
34+
code = "%%"
35+
owners = [{
36+
regex = "Term.ApplyInfix"
37+
}]
38+
}
39+
]
540
includeCurlyBraceInSelectChains = true
641
maxColumn = 120
742
rewrite.rules = [RedundantParens, SortImports, PreferCurlyFors]
843
spaces.inImportCurlyBraces = true
944
binPack.literalArgumentLists = false
10-
unindentTopLevelOperators = true
11-
optIn.breaksInsideChains = true
45+
optIn.breaksInsideChains = true

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def crossScalacOptions(scalaVersion: String): Seq[String] = CrossVersion.partial
1717

1818
lazy val baseSettings = Seq(
1919
organization := "com.github.j5ik2o",
20-
homepage := Some(url("https://github.com/j5ik2o/docker-controller-scala")),
21-
licenses := List("The MIT License" -> url("http://opensource.org/licenses/MIT")),
20+
homepage := Some(url("https://github.com/j5ik2o/docker-controller-scala")),
21+
licenses := List("The MIT License" -> url("http://opensource.org/licenses/MIT")),
2222
developers := List(
2323
Developer(
2424
id = "j5ik2o",
@@ -27,7 +27,7 @@ lazy val baseSettings = Seq(
2727
url = url("https://blog.j5ik2o.me")
2828
)
2929
),
30-
scalaVersion := Versions.scala213Version,
30+
scalaVersion := Versions.scala213Version,
3131
crossScalaVersions := Seq(Versions.scala212Version, Versions.scala213Version, Versions.scala3Version),
3232
scalacOptions ++= (Seq(
3333
"-unchecked",
@@ -48,8 +48,8 @@ lazy val baseSettings = Seq(
4848
dependencyOverrides ++= Seq(
4949
"com.fasterxml.jackson.core" % "jackson-databind" % "2.11.0"
5050
),
51-
Test / publishArtifact := false,
52-
Test / fork := true,
51+
Test / publishArtifact := false,
52+
Test / fork := true,
5353
Test / parallelExecution := false,
5454
Compile / doc / sources := {
5555
val old = (Compile / doc / sources).value

docker-controller-scala-scalatest/src/main/scala/com/github/j5ik2o/dockerController/DockerControllerSpecSupport.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ trait DockerControllerSpecSupport extends SuiteMixin with DockerControllerHelper
6868
}
6969

7070
protected def beforeCreateContainers(): Unit = {}
71-
protected def afterCreateContainers(): Unit = {}
72-
protected def beforeStartContainers(): Unit = {}
73-
protected def afterStartContainers(): Unit = {}
74-
protected def beforeStopContainers(): Unit = {}
75-
protected def afterStopContainers(): Unit = {}
71+
protected def afterCreateContainers(): Unit = {}
72+
protected def beforeStartContainers(): Unit = {}
73+
protected def afterStartContainers(): Unit = {}
74+
protected def beforeStopContainers(): Unit = {}
75+
protected def afterStopContainers(): Unit = {}
7676
protected def beforeRemoveContainers(): Unit = {}
77-
protected def afterRemoveContainers(): Unit = {}
77+
protected def afterRemoveContainers(): Unit = {}
7878

7979
abstract override def run(testName: Option[String], args: Args): Status = {
8080
(createRemoveLifecycle, startStopLifecycle) match {

docker-controller-scala-zookeeper/src/test/scala/com/github/j5ik2o/dockerController/ZooKeeperControllerSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ class ZooKeeperControllerSpec extends AnyFreeSpec with DockerControllerSpecSuppo
4444
}
4545
)
4646
connectionLatch.await(10, TimeUnit.SECONDS)
47-
} finally if (zk != null)
48-
zk.close()
47+
} finally
48+
if (zk != null)
49+
zk.close()
4950
}
5051
}
5152

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
2-
3-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
1+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
42

53
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
64

5+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
6+
77
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.0")
88

99
addDependencyTreePlugin

0 commit comments

Comments
 (0)