From a168a6a07ee9a40b9d48eb18c867731a618657cf Mon Sep 17 00:00:00 2001 From: Scott Frazer Date: Mon, 22 Feb 2016 14:24:09 -0500 Subject: [PATCH 1/3] update build.sbt with correct version of wdl4s --- build.sbt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 298bbbd..2b1cee8 100644 --- a/build.sbt +++ b/build.sbt @@ -20,13 +20,17 @@ git.gitUncommittedChanges := true versionWithGit -assemblyJarName in assembly := "wdltool" + git.baseVersion.value + ".jar" +assemblyJarName in assembly := "wdltool-" + git.baseVersion.value + ".jar" logLevel in assembly := Level.Info +resolvers ++= Seq( + "Broad Artifactory Releases" at "https://artifactory.broadinstitute.org/artifactory/libs-release/", + "Broad Artifactory Snapshots" at "https://artifactory.broadinstitute.org/artifactory/libs-snapshot/" +) libraryDependencies ++= Seq( - "org.broadinstitute" %% "wdl4s" % "0.1", + "org.broadinstitute" %% "wdl4s" % "0.3-5c8eef7-SNAPSHOT", //---------- Test libraries -------------------// "org.scalatest" %% "scalatest" % "2.2.5" % Test ) From 73e454590b9d34777249f23e024c6e17d4310fb1 Mon Sep 17 00:00:00 2001 From: Scott Frazer Date: Tue, 1 Mar 2016 11:23:24 -0500 Subject: [PATCH 2/3] version 0.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2b1cee8..1f314db 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ organization := "org.broadinstitute" scalaVersion := "2.11.7" // Upcoming release, or current if we're on the master branch -git.baseVersion := "0.1" +git.baseVersion := "0.2" // Shorten the git commit hash git.gitHeadCommit := git.gitHeadCommit.value map { _.take(7) } From f0d29c856efa69c0cdccd7f5027eb070e47f3494 Mon Sep 17 00:00:00 2001 From: Scott Frazer Date: Tue, 1 Mar 2016 11:26:43 -0500 Subject: [PATCH 3/3] versions --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 1f314db..bb6b2cd 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ organization := "org.broadinstitute" scalaVersion := "2.11.7" // Upcoming release, or current if we're on the master branch -git.baseVersion := "0.2" +git.baseVersion := "0.3" // Shorten the git commit hash git.gitHeadCommit := git.gitHeadCommit.value map { _.take(7) } @@ -30,7 +30,7 @@ resolvers ++= Seq( ) libraryDependencies ++= Seq( - "org.broadinstitute" %% "wdl4s" % "0.3-5c8eef7-SNAPSHOT", + "org.broadinstitute" %% "wdl4s" % "0.3", //---------- Test libraries -------------------// "org.scalatest" %% "scalatest" % "2.2.5" % Test )