Skip to content
This repository has been archived by the owner on Jan 25, 2018. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thibault Jeandet committed Mar 29, 2016
2 parents a652216 + e765ec8 commit 6356a4e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
13 changes: 13 additions & 0 deletions .pullapprove.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
approve_by_comment: true
approve_regex: ':\+1:'
reset_on_push: false
author_approval: ignored
reviewers:
required: 2
members:
- cjllanwarne
- Horneth
- scottfrazer
- mcovarr
- geoffjentry
- kshakir
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.3"
git.baseVersion := "0.4"

// Shorten the git commit hash
git.gitHeadCommit := git.gitHeadCommit.value map { _.take(7) }
Expand All @@ -30,7 +30,7 @@ resolvers ++= Seq(
)

libraryDependencies ++= Seq(
"org.broadinstitute" %% "wdl4s" % "0.3",
"org.broadinstitute" %% "wdl4s" % "0.4",
//---------- Test libraries -------------------//
"org.scalatest" %% "scalatest" % "2.2.5" % Test
)
Expand Down

0 comments on commit 6356a4e

Please sign in to comment.