Skip to content
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.6
493d2699cdf51f985459dbae931081d25c36b51d
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.6
runner.dialect = scala3

align.preset = most
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ 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)
.settings(
name := "domainDocs4s-core",
libraryDependencies ++= Seq(
"ch.epfl.scala" %% "tasty-query" % "1.6.1",
"ch.epfl.scala" %% "tasty-query" % "1.7.0",
),
)

Expand All @@ -59,4 +59,4 @@ lazy val stableVersion = taskKey[String]("stableVersion")
stableVersion := {
if (isVersionStable.value && !isSnapshot.value) version.value
else previousStableVersion.value.getOrElse("unreleased")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.12.0
sbt.version = 1.12.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.3")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
Loading