Merge pull request #138 from alexarchambault/merge-upstream

alexarchambault · web-flow · commit 127c509f7fca · 2023-03-31T16:30:38.000+02:00
Merge upstream changes
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.2"
+version = "3.7.3"
 
 align.preset = more
 maxColumn = 100
diff --git a/backend/.scalafmt.conf b/backend/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.2"
+version = "3.7.3"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk
diff --git a/benchmarks/.scalafmt.conf b/benchmarks/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.2"
+version = "3.7.3"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk
diff --git a/bridges/.scalafmt.conf b/bridges/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.2"
+version = "3.7.3"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk
diff --git a/build.sc b/build.sc
@@ -65,7 +65,7 @@ object Dependencies {
   def scalaJsEnvJsdomNode1   = ivy"org.scala-js::scalajs-env-jsdom-nodejs:1.1.0"
   def scalaJsSbtTestAdapter1 = ivy"org.scala-js::scalajs-sbt-test-adapter:$scalaJs1Version"
   def scalaJsLogging1        = ivy"org.scala-js::scalajs-logging:1.1.1"
-  def scalaNativeTools04     = ivy"org.scala-native::tools:0.4.11"
+  def scalaNativeTools04     = ivy"org.scala-native::tools:0.4.12"
   def scalazCore             = ivy"org.scalaz::scalaz-core:7.3.7"
   def snailgun      = ivy"io.github.alexarchambault.scala-cli.snailgun::snailgun-core:0.4.1-sc2"
   def sourcecode    = ivy"com.lihaoyi::sourcecode:0.3.0"
diff --git a/buildpress-config/.scalafmt.conf b/buildpress-config/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.2"
+version = "3.7.3"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk
diff --git a/frontend/.scalafmt.conf b/frontend/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.2"
+version = "3.7.3"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk
diff --git a/shared/.scalafmt.conf b/shared/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.2"
+version = "3.7.3"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.7.2"`
	`1`	`+version = "3.7.3"`
`2`	`2`
`3`	`3`	`align.preset = more`
`4`	`4`	`maxColumn = 100`