Merge branch 'develop'

build.sbt

@@ -6,11 +6,13 @@ name := "wdltool"
 
 organization := "org.broadinstitute"
 
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.1"
+
+val wdl4sV = "0.10-f7a345e-SNAP"
 
 lazy val versionSettings = Seq(
   // Upcoming release, or current if we're on the master branch
-  git.baseVersion := "0.9",
+  git.baseVersion := "0.10",
 
   // Shorten the git commit hash
   git.gitHeadCommit := git.gitHeadCommit.value map { _.take(7) },
@@ -34,9 +36,9 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.broadinstitute" %% "wdl4s" % "0.10",
+  "org.broadinstitute" %% "wdl4s" % wdl4sV,
   //---------- Test libraries -------------------//
-  "org.scalatest" %% "scalatest" % "2.2.5" % Test
+  "org.scalatest" %% "scalatest" % "3.0.1" % Test
 )
 
 val customMergeStrategy: String => MergeStrategy = {

project/plugins.sbt

@@ -2,7 +2,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0")