From 1caca886e7098a2833fd6f1cf13b1b686e204bc7 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 25 Oct 2023 15:59:18 +0200 Subject: [PATCH] Update scalafmt-core to 3.7.15 (#691) * Update scalafmt-core to 3.7.15 * Reformat with scalafmt 3.7.15 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.7.15' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ .scalafmt.conf | 2 +- build.sbt | 9 ++++----- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..1e3ddf9d0 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.15 +2fd0bf62fcd7a71afe5aa2459cab002d719ffb5f diff --git a/.scalafmt.conf b/.scalafmt.conf index 562a2b5cb..8c3c6e892 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.14 +version = 3.7.15 runner.dialect = scala213source3 maxColumn = 120 diff --git a/build.sbt b/build.sbt index 6488de275..42e7e84ef 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 - lazy val commonSettings = Seq( organization := "edu.berkeley.cs", scalaVersion := "2.13.10", - crossScalaVersions := Seq("2.13.10"), + crossScalaVersions := Seq("2.13.10") ) val chiselVersion = "6.0.0-M3" @@ -33,7 +32,7 @@ lazy val chiseltestSettings = Seq( compilerPlugin(("org.chipsalliance" % "chisel-plugin" % chiselVersion).cross(CrossVersion.full)) ), resolvers ++= Resolver.sonatypeOssRepos("snapshots"), - resolvers ++= Resolver.sonatypeOssRepos("releases"), + resolvers ++= Resolver.sonatypeOssRepos("releases") ) lazy val publishSettings = Seq( @@ -74,10 +73,10 @@ lazy val publishSettings = Seq( } else { Some("releases".at(nexus + "service/local/staging/deploy/maven2")) } - }, + } ) lazy val chiseltest = (project in file(".")) .settings(commonSettings) .settings(chiseltestSettings) - .settings(publishSettings) \ No newline at end of file + .settings(publishSettings)