Skip to content

Commit

Permalink
Update Scalatest dependency to 3.1.0
Browse files Browse the repository at this point in the history
Scala Steward ran the scalafix migrations, but did not touch the dependency.
  • Loading branch information
marcospereira committed Dec 13, 2019
1 parent 87a4631 commit 535b5f6
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import org.scalajs.jsenv.nodejs.NodeJSEnv
// Binary compatibility is this version
val previousVersion: Option[String] = None

val ScalaTestVersion = "3.1.0"

def binaryCompatibilitySettings(org: String, moduleName: String, scalaBinVersion: String): Set[ModuleID] = {
if (scalaBinVersion.equals(scala213)) Set.empty
else
Expand Down Expand Up @@ -91,7 +93,7 @@ lazy val api = crossProject(JVMPlatform, JSPlatform)
name := "twirl-api",
jsEnv := nodeJs,
libraryDependencies ++= scalaXml.value,
libraryDependencies += "org.scalatest" %%% "scalatest" % scalatest(scalaVersion.value) % "test",
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % "test",
mimaPreviousArtifacts := binaryCompatibilitySettings(
organization.value,
moduleName.value,
Expand All @@ -109,8 +111,8 @@ lazy val parser = project
.settings(
name := "twirl-parser",
libraryDependencies ++= scalaParserCombinators(scalaVersion.value),
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
libraryDependencies += "org.scalatest" %%% "scalatest" % scalatest(scalaVersion.value) % "test",
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % "test",
mimaPreviousArtifacts := binaryCompatibilitySettings(organization.value, moduleName.value, scalaBinaryVersion.value)
)

Expand Down Expand Up @@ -141,7 +143,7 @@ lazy val plugin = project
name := "sbt-twirl",
organization := "com.typesafe.sbt",
scalaVersion := scala212,
libraryDependencies += "org.scalatest" %%% "scalatest" % scalatest(scalaVersion.value) % "test",
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % "test",
resourceGenerators in Compile += generateVersionFile.taskValue,
scriptedDependencies := {
scriptedDependencies.value
Expand Down Expand Up @@ -175,12 +177,6 @@ def generateVersionFile = Def.task {
Seq(file)
}

// Dependencies

def scalatest(scalaV: String): String = scalaV match {
case _ => "3.0.8"
}

def scalaCompiler(version: String) = "org.scala-lang" % "scala-compiler" % version

def scalaParserCombinators(scalaVersion: String): Seq[ModuleID] = scalaVersion match {
Expand Down

0 comments on commit 535b5f6

Please sign in to comment.