Skip to content

Commit 6dfa6e1

Browse files
authored
Merge pull request #8 from Atry/update/main/scalafmt-core-3.7.2
Update scalafmt-core to 3.7.2 in main
2 parents c26113e + 7aa0c2d commit 6dfa6e1

File tree

6 files changed

+19
-16
lines changed

6 files changed

+19
-16
lines changed

.git-blame-ignore-revs

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# Scala Steward: Reformat with scalafmt 3.1.2
22
fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6
3+
4+
# Scala Steward: Reformat with scalafmt 3.7.2
5+
127db711dde71e3e028549511b33f39da85ed9a8

.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
runner.dialect = scala3
2-
version = "3.7.1"
2+
version = "3.7.2"
33
maxColumn = 80

BindingHtmlToReact/build.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,7 @@ scalacOptions ++= PartialFunction.condOpt(
6363
libraryDependencies ++= PartialFunction.condOpt(
6464
scalaBinaryVersion.value
6565
) { case "2.12" =>
66-
compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full)
66+
compilerPlugin(
67+
"org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full
68+
)
6769
}

BindingHtmlToReact/src/main/scala-2/com/yang_bo/BindingHtmlToReactImplicits2Or3.scala

+4-6
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ private[yang_bo] trait BindingHtmlToReactImplicits2Or3 {
3030
* >+</button>
3131
* }
3232
* }}}
33-
* The `@html` literal
34-
* can be then used as a React component with the help of
35-
* [[BindingHtmlToReact.Implicits]]:
33+
* The `@html` literal can be then used as a React component with the help
34+
* of [[BindingHtmlToReact.Implicits]]:
3635
* {{{
3736
* import com.yang_bo.BindingHtmlToReact.Implicits._
3837
* import slinky.web.html._
@@ -42,9 +41,8 @@ private[yang_bo] trait BindingHtmlToReactImplicits2Or3 {
4241
* spinner(currentNumber)
4342
* )
4443
* }}}
45-
* Then, the `@html`
46-
* literal can be [[org.lrng.binding.html.render render]]ed into the html
47-
* document,
44+
* Then, the `@html` literal can be
45+
* [[org.lrng.binding.html.render render]]ed into the html document,
4846
* {{{
4947
* import slinky.web.ReactDOM
5048
* import slinky.testrenderer.TestRenderer

ReactToBindingHtml/build.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,7 @@ scalacOptions ++= PartialFunction.condOpt(
6363
libraryDependencies ++= PartialFunction.condOpt(
6464
scalaBinaryVersion.value
6565
) { case "2.12" =>
66-
compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full)
66+
compilerPlugin(
67+
"org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full
68+
)
6769
}

ReactToBindingHtml/src/main/scala-2/com/yang_bo/ReactToBindingHtmlImplicits2Or3.scala

+5-7
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ private[yang_bo] trait ReactToBindingHtmlImplicits2Or3 {
1010

1111
/** Provides the [[com.thoughtworks.binding.bindable.Bindable Bindable]] and
1212
* [[com.thoughtworks.binding.bindable.BindableSeq BindableSeq]] instances
13-
* that allow for inserting React virtual DOM into an
14-
* `@html` literal.
13+
* that allow for inserting React virtual DOM into an `@html` literal.
1514
* @example
1615
* The following code creates a React virtual DOM tree of a spinner. With
1716
* the help of [[BindingReactToReact.Implicits]], the virtual DOM uses
@@ -39,9 +38,8 @@ private[yang_bo] trait ReactToBindingHtmlImplicits2Or3 {
3938
* )
4039
* }
4140
* }}}
42-
* The virtual DOM can be inserted into a
43-
* `@html` literal with the help
44-
* of [[ReactToBindingHtml.Implicits]]:
41+
* The virtual DOM can be inserted into a `@html` literal with the help of
42+
* [[ReactToBindingHtml.Implicits]]:
4543
* {{{
4644
* import com.yang_bo.ReactToBindingHtml.Implicits._
4745
* import org.lrng.binding.html
@@ -51,8 +49,8 @@ private[yang_bo] trait ReactToBindingHtmlImplicits2Or3 {
5149
* {spinner(currentNumber)}
5250
* </fieldset>
5351
* }}}
54-
* Then, the `@html` literal can
55-
* be [[org.lrng.binding.html.render render]]ed into the html document,
52+
* Then, the `@html` literal can be
53+
* [[org.lrng.binding.html.render render]]ed into the html document,
5654
* {{{
5755
* import slinky.web.ReactDOM
5856
* import slinky.testrenderer.TestRenderer

0 commit comments

Comments
 (0)