Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update scalafmt-core to 3.0.8 #115

Merged
merged 2 commits into from
Dec 29, 2021
Merged
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: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.0.0-RC6"
version = "3.0.8"
runner.dialect = scala3

align.preset = more
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ lazy val scalaYamlCore = crossProject(JSPlatform, JVMPlatform)
name := projectName,
scalaVersion := scala3Version,
semanticdbEnabled := true,
libraryDependencies ++= Seq(Deps.pprint % Test),
libraryDependencies ++= Seq(Deps.pprint % Test)
)
.settings(docsSettings)
.settings(munit)
Expand All @@ -45,9 +45,9 @@ lazy val scalaYamlTestSuite = crossProject(JSPlatform, JVMPlatform)
.configs(IntegrationTest)
.settings(
Defaults.itSettings,
name := "testSuite",
scalaVersion := scala3Version,
semanticdbEnabled := true,
name := "testSuite",
scalaVersion := scala3Version,
semanticdbEnabled := true
)
.settings(testSettings)
.dependsOn(scalaYamlCore)
4 changes: 2 additions & 2 deletions project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ object BuildHelper {
)

lazy val testSettings: Seq[Setting[_]] = Seq(
publish / skip := true,
libraryDependencies ++= Seq(Deps.osLib, Deps.munit, Deps.pprint)
publish / skip := true,
libraryDependencies ++= Seq(Deps.osLib, Deps.munit, Deps.pprint)
) ++ munit

lazy val munit: Seq[Setting[_]] = Seq(
Expand Down
6 changes: 3 additions & 3 deletions project/Deps.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbt._

object Deps {
lazy val munit = "org.scalameta" %% "munit" % "0.7.26"
lazy val osLib = "com.lihaoyi" %% "os-lib" % "0.7.8"
lazy val pprint = "com.lihaoyi" %% "pprint" % "0.6.6"
lazy val munit = "org.scalameta" %% "munit" % "0.7.26"
lazy val osLib = "com.lihaoyi" %% "os-lib" % "0.7.8"
lazy val pprint = "com.lihaoyi" %% "pprint" % "0.6.6"
}
8 changes: 4 additions & 4 deletions project/plugin.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ object YamlCodec:
def construct(node: Node)(using
settings: LoadSettings = LoadSettings.empty
): Either[ConstructError, T] = decoder.construct(node)
def asNode(obj: T): Node = encoder.asNode(obj)
def asNode(obj: T): Node = encoder.asNode(obj)

end YamlCodec