From caa8f1d0092cc020e8b1d7a889b16eaef68261e3 Mon Sep 17 00:00:00 2001 From: Ruchi Munshi Date: Fri, 3 Mar 2017 16:10:26 -0500 Subject: [PATCH 1/3] Update develop to the next version of Wdltool --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5519c4e..ed92493 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ scalaVersion := "2.11.8" 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) }, From 5e1be25fed6e9edceaa38cb87b5d0775de0c5c35 Mon Sep 17 00:00:00 2001 From: Thibault Jeandet Date: Mon, 13 Mar 2017 13:52:38 -0400 Subject: [PATCH 2/3] make build.sbt more script friendly --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ed92493..589a2a5 100644 --- a/build.sbt +++ b/build.sbt @@ -8,6 +8,8 @@ organization := "org.broadinstitute" scalaVersion := "2.11.8" +val wdl4sV = "0.10" + lazy val versionSettings = Seq( // Upcoming release, or current if we're on the master branch git.baseVersion := "0.10", @@ -34,7 +36,7 @@ resolvers ++= Seq( ) libraryDependencies ++= Seq( - "org.broadinstitute" %% "wdl4s" % "0.10", + "org.broadinstitute" %% "wdl4s" % wdl4sV, //---------- Test libraries -------------------// "org.scalatest" %% "scalatest" % "2.2.5" % Test ) From a8f2b9f1504f419513bd372bf413a376c34c8fa5 Mon Sep 17 00:00:00 2001 From: geoffjentry Date: Sat, 25 Mar 2017 13:50:25 -0400 Subject: [PATCH 3/3] Update to using scala 2.12 --- build.sbt | 6 +++--- project/plugins.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 589a2a5..41ad0bb 100644 --- a/build.sbt +++ b/build.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 = { diff --git a/project/plugins.sbt b/project/plugins.sbt index 20755cc..cadbd87 100644 --- a/project/plugins.sbt +++ b/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")