Merge branch 'master' into update/sbt-scalafmt-2.5.2

colindean · web-flow · commit ba4b370ae3ca · 2024-01-30T15:42:43.000-05:00
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.12
+version = 3.7.17
 runner.dialect = scala211
 project.git = true
 align.preset = none
diff --git a/build.sbt b/build.sbt
@@ -41,7 +41,7 @@ libraryDependencies ++= Seq(
   "io.circe" %% "circe-parser" % circeVersion,
   "org.apache.spark" %% "spark-sql" % sparkVersion % Provided,
   "junit" % "junit" % "4.13.2" % Test,
-  "org.scalatest" %% "scalatest" % "3.2.16" % Test,
+  "org.scalatest" %% "scalatest" % "3.2.17" % Test,
   "com.github.sbt" % "junit-interface" % "0.13.3" % Test exclude ("junit", "junit-dep")
 )
 
diff --git a/project/assembly.sbt b/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ libraryDependencies ++= Seq(`
`41`	`41`	`"io.circe" %% "circe-parser" % circeVersion,`
`42`	`42`	`"org.apache.spark" %% "spark-sql" % sparkVersion % Provided,`
`43`	`43`	`"junit" % "junit" % "4.13.2" % Test,`
`44`		`- "org.scalatest" %% "scalatest" % "3.2.16" % Test,`
	`44`	`+ "org.scalatest" %% "scalatest" % "3.2.17" % Test,`
`45`	`45`	`"com.github.sbt" % "junit-interface" % "0.13.3" % Test exclude ("junit", "junit-dep")`
`46`	`46`	`)`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")`
	`1`	`+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")`