diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..8a0e42b --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.6 +7532c163477a47aa41bfb4e8c0dad448a1ab7758 diff --git a/.scalafmt.conf b/.scalafmt.conf index e171375..b727cb0 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.6 runner.dialect = scala3 align.preset = most diff --git a/build.sbt b/build.sbt index 1990b07..b68f940 100644 --- a/build.sbt +++ b/build.sbt @@ -25,15 +25,15 @@ lazy val commonSettings = Seq( ), versionScheme := Some("semver-spec"), Test / tpolecatExcludeOptions += ScalacOptions.warnNonUnitStatement, - Test / fork := true // required for tasty collector to work + Test / fork := true, // required for tasty collector to work ) lazy val root = (project in file(".")) .settings( - name := "domainDocs4s", + name := "domainDocs4s", publish / skip := true, ) - .aggregate(core , examples) + .aggregate(core, examples) lazy val core = (project in file("domainDocs4s-core")) .settings(commonSettings) @@ -59,4 +59,4 @@ lazy val stableVersion = taskKey[String]("stableVersion") stableVersion := { if (isVersionStable.value && !isSnapshot.value) version.value else previousStableVersion.value.getOrElse("unreleased") -} \ No newline at end of file +} diff --git a/domainDocs4s-core/src/main/scala/domaindocs4s/collector/Collector.scala b/domainDocs4s-core/src/main/scala/domaindocs4s/collector/Collector.scala index d2b09fc..9c977e3 100644 --- a/domainDocs4s-core/src/main/scala/domaindocs4s/collector/Collector.scala +++ b/domainDocs4s-core/src/main/scala/domaindocs4s/collector/Collector.scala @@ -21,8 +21,8 @@ case class Documentation(symbols: List[DocumentedSymbol]) { // TODO not optimal impl parent <- child.path.flatMap(pathElem => symbols.find(_.symbol == pathElem)).lastOption } builder(parent).append(child) - val roots = builder.filter(x => !builder.exists(_._2.contains(x))).keys - def buildTree(s: DocumentedSymbol): DocumentationTree = { + val roots = builder.filter(x => !builder.exists(_._2.contains(x))).keys + def buildTree(s: DocumentedSymbol): DocumentationTree = { DocumentationTree(s, builder(s).map(buildTree).toList) } roots.map(buildTree).toList diff --git a/project/plugins.sbt b/project/plugins.sbt index 014fae7..8e2c68c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") \ No newline at end of file +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")