From 952647b2298372ddf155f440884f43685c6ba51b Mon Sep 17 00:00:00 2001 From: adamw Date: Wed, 21 Apr 2021 16:33:46 +0200 Subject: [PATCH] Update scala --- build.sbt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index ea673cd6..4713c3f2 100644 --- a/build.sbt +++ b/build.sbt @@ -4,9 +4,9 @@ val scala2_11 = "2.11.12" val scala2_12 = "2.12.13" val scala2_13 = "2.13.5" val scala2 = List(scala2_11, scala2_12, scala2_13) -val scala3 = List("3.0.0-RC2") +val scala3 = List("3.0.0-RC3") -val scalaTestVersion = "3.2.7" +val scalaTestVersion = "3.2.8" excludeLintKeys in Global ++= Set(ideSkipProject) @@ -31,10 +31,11 @@ val commonJsSettings = commonSettings ++ Seq( if (isSnapshot.value) Seq.empty else Seq { - val mapSourcePrefix = if (ScalaArtifacts.isScala3(scalaVersion.value)) - "-scalajs-mapSourceURI" - else - "-P:scalajs:mapSourceURI" + val mapSourcePrefix = + if (ScalaArtifacts.isScala3(scalaVersion.value)) + "-scalajs-mapSourceURI" + else + "-P:scalajs:mapSourceURI" val dir = project.base.toURI.toString.replaceFirst("[^/]+/?$", "") val url = "https://raw.githubusercontent.com/softwaremill/sttp-model" s"$mapSourcePrefix:$dir->$url/v${version.value}/"