Permalink
Browse files
Update to using scala 2.12
- Loading branch information...
Showing
with
4 additions
and
4 deletions.
-
+3
−3
build.sbt
-
+1
−1
project/plugins.sbt
|
|
@@ -6,9 +6,9 @@ name := "wdltool" |
|
|
|
|
|
organization := "org.broadinstitute"
|
|
|
|
|
|
-scalaVersion := "2.11.8"
|
|
|
+scalaVersion := "2.12.1"
|
|
|
|
|
|
-val wdl4sV = "0.10"
|
|
|
+val wdl4sV = "0.10-f7a345e-SNAP"
|
|
|
|
|
|
lazy val versionSettings = Seq(
|
|
|
// Upcoming release, or current if we're on the master branch
|
|
|
@@ -38,7 +38,7 @@ resolvers ++= Seq( |
|
|
libraryDependencies ++= Seq(
|
|
|
"org.broadinstitute" %% "wdl4s" % wdl4sV,
|
|
|
//---------- Test libraries -------------------//
|
|
|
- "org.scalatest" %% "scalatest" % "2.2.5" % Test
|
|
|
+ "org.scalatest" %% "scalatest" % "3.0.1" % Test
|
|
|
)
|
|
|
|
|
|
val customMergeStrategy: String => MergeStrategy = {
|
|
|
|
|
|
@@ -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")
|
|
|
|
|
|
|
0 comments on commit
a8f2b9f