Skip to content

Commit

Permalink
Merge pull request #23 from ryan-williams/ug
Browse files Browse the repository at this point in the history
bump deps, rm dead code
  • Loading branch information
ryan-williams committed Jan 22, 2018
2 parents 8f791a1 + c5de266 commit c1ad839
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -5,17 +5,17 @@ jdk:
- oraclejdk8

scala:
- 2.11.8
- 2.11.12

script: sbt ++$TRAVIS_SCALA_VERSION clean test
script: sbt ++$TRAVIS_SCALA_VERSION clean coverageTest

cache:
directories:
- $HOME/.ivy2/cache
- $HOME/.sbt/boot/
- $HOME/.zinc

after_success: sbt ++$TRAVIS_SCALA_VERSION travis-report
after_success: sbt ++$TRAVIS_SCALA_VERSION travisReport

before_cache:
# Tricks to avoid unnecessary cache updates
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
@@ -1,4 +1,4 @@
organization := "org.hammerlab.genomics"
group("org.hammerlab.genomics")
name := "loci"

github.repo("genomic-loci")
Expand All @@ -7,13 +7,13 @@ addSparkDeps

dep(
args4j,
args4s % "1.3.0",
args4s % "1.3.1",
htsjdk,
iterators % "2.0.0",
paths % "1.4.0",
reference % "1.4.1" + testtest,
reference % "1.4.2" + testtest,
scalautils,
spark_util % "2.0.1",
spark_util % "2.0.2",
string_utils % "1.2.0"
)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=1.0.4
sbt.version=1.1.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
@@ -1 +1 @@
addSbtPlugin("org.hammerlab.sbt" % "base" % "4.1.0")
addSbtPlugin("org.hammerlab.sbt" % "base" % "4.2.0")

This file was deleted.

0 comments on commit c1ad839

Please sign in to comment.