From c100e7192e3bbce452684155ba8e00dab3603895 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 25 Sep 2021 18:58:54 +0200 Subject: [PATCH 1/2] Update scalafmt-core to 3.0.5 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index bda330f63..6b648d684 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.4" +version = "3.0.5" align.preset = more maxColumn = 80 assumeStandardLibraryStripMargin = true From 1c6a412976076e2d19af75f5044de6ca6c06f55b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 25 Sep 2021 18:59:04 +0200 Subject: [PATCH 2/2] Reformat with scalafmt 3.0.5 --- build.sbt | 12 ++++++------ project/plugins.sbt | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 3a47583b4..9e8968b28 100644 --- a/build.sbt +++ b/build.sbt @@ -43,18 +43,18 @@ val sparkVersion = "3.1.2" lazy val core = project .in(file("core")) .settings( - name := "doric", + name := "doric", run / fork := true, libraryDependencies ++= Seq( "org.apache.spark" %% "spark-sql" % sparkVersion % "provided", "org.typelevel" %% "cats-core" % "2.6.1", "com.lihaoyi" %% "sourcecode" % "0.2.7", - "com.github.mrpowers" %% "spark-daria" % "1.0.0" % "test", - "com.github.mrpowers" %% "spark-fast-tests" % "1.0.0" % "test", - "org.scalatest" %% "scalatest" % "3.2.10" % "test" + "com.github.mrpowers" %% "spark-daria" % "1.0.0" % "test", + "com.github.mrpowers" %% "spark-fast-tests" % "1.0.0" % "test", + "org.scalatest" %% "scalatest" % "3.2.10" % "test" ), //docs - run / fork := true, + run / fork := true, Compile / doc / autoAPIMappings := true, Compile / doc / scalacOptions ++= Seq( "-groups", @@ -75,7 +75,7 @@ lazy val docs = project "org.apache.spark" %% "spark-sql" % sparkVersion ), mdocVariables := Map( - "VERSION" -> version.value, + "VERSION" -> version.value, "SPARK_VERSION" -> sparkVersion ), mdocExtraArguments := Seq( diff --git a/project/plugins.sbt b/project/plugins.sbt index dbf1bb5c7..b60a0e3b1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ logLevel := Level.Warn -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.23") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.23")