Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #134

Merged
merged 10 commits into from Jun 22, 2018
14 changes: 11 additions & 3 deletions .travis.yml
Expand Up @@ -4,16 +4,24 @@ cache:
directories:
- $HOME/.m2
jdk:
- oraclejdk10
- oraclejdk9
- oraclejdk8
- openjdk11
- openjdk10
- openjdk9
- openjdk8
- openjdk7
env:
matrix:
- VERSION='1.7'
- VERSION='1.8'
- VERSION='1.9'
script: lein with-profile dev,$VERSION test
- VERSION='1.10'
before_install:
- if [ -f "${JAVA_HOME}/lib/security/cacerts" -a -w "${JAVA_HOME}/lib/security/cacerts" ]; then rm "${JAVA_HOME}/lib/security/cacerts" && ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"; fi;
script:
- lein with-profile dev,$VERSION test
- lein with-profile dev,1.9 bin
- target/cljam version
jobs:
include:
- stage: coverage
Expand Down
2 changes: 1 addition & 1 deletion deploy-snapshot.sh
Expand Up @@ -3,5 +3,5 @@
set -e

if head -n 1 project.clj | grep -e '-SNAPSHOT' >/dev/null; then
lein with-profile +1.8 deploy snapshots
lein with-profile +1.9 deploy snapshots
fi
21 changes: 11 additions & 10 deletions project.clj
Expand Up @@ -3,26 +3,26 @@
:url "https://github.com/chrovis/cljam"
:license {:name "Apache License, Version 2.0"
:url "https://www.apache.org/licenses/LICENSE-2.0"}
:dependencies [[org.clojure/tools.logging "0.4.0"]
[org.clojure/tools.cli "0.3.5"]
[org.apache.commons/commons-compress "1.16.1"]
[clj-sub-command "0.4.0"]
:dependencies [[org.clojure/tools.logging "0.4.1"]
[org.clojure/tools.cli "0.3.7"]
[org.apache.commons/commons-compress "1.17"]
[clj-sub-command "0.4.1"]
[digest "1.4.8"]
[bgzf4j "0.1.0"]
[com.climate/claypoole "1.1.4"]
[camel-snake-kebab "0.4.0"]
[proton "0.1.6"]]
:profiles {:dev {:dependencies [[org.clojure/clojure "1.8.0"]
[cavia "0.5.0"]
:profiles {:dev {:dependencies [[org.clojure/clojure "1.9.0"]
[cavia "0.5.1"]
[criterium "0.4.4"]
[net.totakke/libra "0.1.1"]
[org.tcrawley/dynapath "1.0.0"]
[se.haleby/stub-http "0.2.5"]]
:plugins [[lein-binplus "0.6.2" :exclusions [org.clojure/clojure]]
[lein-codox "0.10.3"]
:plugins [[lein-binplus "0.6.4" :exclusions [org.clojure/clojure]]
[lein-codox "0.10.4"]
[lein-marginalia "0.9.1" :exclusions [org.clojure/clojure]]
[lein-cloverage "1.0.10" :exclusions [org.clojure/clojure org.tcrawley/dynapath]]
[net.totakke/lein-libra "0.1.0"]]
[net.totakke/lein-libra "0.1.2"]]
:test-selectors {:default #(not-any? % [:slow :remote])
:slow :slow ; Slow tests with local resources
:remote :remote ; Tests with remote resources
Expand All @@ -32,7 +32,8 @@
:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
:1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
:uberjar {:dependencies [[org.clojure/clojure "1.8.0"]
:1.10 {:dependencies [[org.clojure/clojure "1.10.0-alpha4"]]}
:uberjar {:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.logging.log4j/log4j-api "2.11.0"]
[org.apache.logging.log4j/log4j-core "2.11.0"]]
:resource-paths ["bin-resources"]
Expand Down