From b87d84a5f5894a313bdc8189e0da99b5e94b9d99 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Sep 2023 23:11:33 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.7.14 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 25a792c2..f6d42577 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.5.9 +version = 3.7.14 maxColumn = 120 From fd5c72a3f14b845c266010db0fd982e9257e1b69 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Sep 2023 23:12:09 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.14 Executed command: scalafmt --non-interactive --- .../material/ui/core/styles/Transitions.scala | 14 ++++++++++++-- .../ui/core/styles/TransitionsOptions.scala | 18 ++++++++++++++++-- .../material/ui/core/styles/package.scala | 6 +++++- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala index 4cd4d1a4..8373ef4a 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/Transitions.scala @@ -7,7 +7,13 @@ import scala.scalajs.js.JSConverters._ trait Transitions extends js.Object { def easing: Easing = js.native def duration: Duration = js.native - def create: js.Function2[js.Array[String], js.UndefOr[CreateTransitionsOptions], String] = js.native + + def create: js.Function2[ + js.Array[String], + js.UndefOr[CreateTransitionsOptions], + String + ] = js.native + def getAutoHeightDuration: js.Function1[Double, Double] = js.native } @@ -16,7 +22,11 @@ object Transitions { def apply( easing: Easing, duration: Duration, - create: js.Function2[js.Array[String], js.UndefOr[CreateTransitionsOptions], String], + create: js.Function2[ + js.Array[String], + js.UndefOr[CreateTransitionsOptions], + String + ], getAutoHeightDuration: Double => Double ) = { val o: Map[String, Any] = Map( diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala index 8505e80d..c4cb4fe9 100644 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/TransitionsOptions.scala @@ -7,7 +7,15 @@ import scala.scalajs.js.JSConverters._ trait TransitionsOptions extends js.Object { def easing: js.UndefOr[EasingPartial] = js.native def duration: js.UndefOr[DurationPartial] = js.native - def create: js.UndefOr[js.Function2[js.Array[String], js.UndefOr[CreateTransitionsOptions], String]] = js.native + + def create: js.UndefOr[ + js.Function2[ + js.Array[String], + js.UndefOr[CreateTransitionsOptions], + String + ] + ] = js.native + def getAutoHeightDuration: js.UndefOr[js.Function1[Double, Double]] = js.native } @@ -16,7 +24,13 @@ object TransitionsOptions { def apply( easing: js.UndefOr[EasingPartial] = js.undefined, duration: js.UndefOr[DurationPartial] = js.undefined, - create: js.UndefOr[js.Function2[js.Array[String], js.UndefOr[CreateTransitionsOptions], String]] = js.undefined, + create: js.UndefOr[ + js.Function2[ + js.Array[String], + js.UndefOr[CreateTransitionsOptions], + String + ] + ] = js.undefined, getAutoHeightDuration: js.UndefOr[Double => Double] = js.undefined ) = { val o: Map[String, Any] = Seq( diff --git a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala index a6020733..d550741c 100755 --- a/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala +++ b/core/src/main/scala/io/kinoplan/scalajs/react/material/ui/core/styles/package.scala @@ -76,7 +76,11 @@ package object styles { ) @js.native object createTypography - extends js.Function2[Palette, TypographyOptions | js.Function1[Palette, TypographyOptions], Typography] { + extends js.Function2[ + Palette, + TypographyOptions | js.Function1[Palette, TypographyOptions], + Typography + ] { override def apply( palette: Palette, From 24ddb032421614c5e148637056432c99836ecb7c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Sep 2023 23:12:09 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.7.14' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 91f1fd23..a89616b9 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.5.9 e1d1b1e181abf55ca0d846d122ad757c17f1036c + +# Scala Steward: Reformat with scalafmt 3.7.14 +fd5c72a3f14b845c266010db0fd982e9257e1b69