From 86de53ef11093689be3d4dfa72201bdc8ce43c22 Mon Sep 17 00:00:00 2001 From: "scala-steward-for-moia[bot]" <97042238+scala-steward-for-moia[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 10:44:21 +0000 Subject: [PATCH] Fix CrossVersion pattern match --- .scalafmt.conf | 2 +- build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 6fe2b620..91e5a2fa 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,5 @@ # https://scalameta.org/scalafmt/docs/configuration.html -version = "3.5.2" +version = "3.5.3" runner.dialect = scala213source3 preset = defaultWithAlign align.preset = most diff --git a/build.sbt b/build.sbt index 105c7cfe..3ee044e7 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ lazy val root = project CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12)) => scalacOptions_2_12 case Some((2, 13)) => scalacOptions_2_13 - case _ => Seq() + case _ => Seq() } }, licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")), @@ -78,7 +78,7 @@ lazy val scalacOptions_2_13 = Seq( "-Xsource:3" ) -lazy val sbtVersionRegex = "v([0-9]+.[0-9]+.[0-9]+)-?(.*)?".r +lazy val sbtVersionRegex = "v(\\d+.\\d+.\\d+)-?(.*)?".r lazy val sbtGitSettings = Seq( git.useGitDescribe := true,