From 26e88ad0b3dfeec1f52aa43f94aa3bae6acb0d70 Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:29:05 +0900 Subject: [PATCH 01/10] Upgrade tools.logging to 0.4.1 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 2295df3d..98267698 100644 --- a/project.clj +++ b/project.clj @@ -3,7 +3,7 @@ :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"] + :dependencies [[org.clojure/tools.logging "0.4.1"] [org.clojure/tools.cli "0.3.5"] [org.apache.commons/commons-compress "1.16.1"] [clj-sub-command "0.4.0"] From ac5ba7d2ade9b29ac4034c4cfd9ad43466f4bb6d Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:29:59 +0900 Subject: [PATCH 02/10] Upgrade clj-sub-command and tools.cli --- project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 98267698..cb30a503 100644 --- a/project.clj +++ b/project.clj @@ -4,9 +4,9 @@ :license {:name "Apache License, Version 2.0" :url "https://www.apache.org/licenses/LICENSE-2.0"} :dependencies [[org.clojure/tools.logging "0.4.1"] - [org.clojure/tools.cli "0.3.5"] + [org.clojure/tools.cli "0.3.7"] [org.apache.commons/commons-compress "1.16.1"] - [clj-sub-command "0.4.0"] + [clj-sub-command "0.4.1"] [digest "1.4.8"] [bgzf4j "0.1.0"] [com.climate/claypoole "1.1.4"] From 0574563c0f374773cf4f1443a4b4be41b30a6a87 Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:31:01 +0900 Subject: [PATCH 03/10] Upgrade commons-compress to 1.17 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index cb30a503..b539bd8c 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "https://www.apache.org/licenses/LICENSE-2.0"} :dependencies [[org.clojure/tools.logging "0.4.1"] [org.clojure/tools.cli "0.3.7"] - [org.apache.commons/commons-compress "1.16.1"] + [org.apache.commons/commons-compress "1.17"] [clj-sub-command "0.4.1"] [digest "1.4.8"] [bgzf4j "0.1.0"] From 8757c2b19700c26bfca924e05b7a09bfa19db278 Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:32:15 +0900 Subject: [PATCH 04/10] Upgrade cavia to 0.5.1 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index b539bd8c..9ae41559 100644 --- a/project.clj +++ b/project.clj @@ -13,7 +13,7 @@ [camel-snake-kebab "0.4.0"] [proton "0.1.6"]] :profiles {:dev {:dependencies [[org.clojure/clojure "1.8.0"] - [cavia "0.5.0"] + [cavia "0.5.1"] [criterium "0.4.4"] [net.totakke/libra "0.1.1"] [org.tcrawley/dynapath "1.0.0"] From 7914c6b10601b3fd5aeea4dcad8af812ac74faf9 Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:33:04 +0900 Subject: [PATCH 05/10] Upgrade lein-libra to 0.1.2 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 9ae41559..ad03a050 100644 --- a/project.clj +++ b/project.clj @@ -22,7 +22,7 @@ [lein-codox "0.10.3"] [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 From 7be498cb2f8b874e326a592e6b30bc7caf4c82bc Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:33:37 +0900 Subject: [PATCH 06/10] Upgrade lein-binplus to 0.6.4 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index ad03a050..bf4bb0d3 100644 --- a/project.clj +++ b/project.clj @@ -18,7 +18,7 @@ [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]] + :plugins [[lein-binplus "0.6.4" :exclusions [org.clojure/clojure]] [lein-codox "0.10.3"] [lein-marginalia "0.9.1" :exclusions [org.clojure/clojure]] [lein-cloverage "1.0.10" :exclusions [org.clojure/clojure org.tcrawley/dynapath]] From f98d2beab6455a7ae083179465325e56a5f9b954 Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:33:56 +0900 Subject: [PATCH 07/10] Upgrade lein-codox to 0.10.4 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index bf4bb0d3..ec2ee360 100644 --- a/project.clj +++ b/project.clj @@ -19,7 +19,7 @@ [org.tcrawley/dynapath "1.0.0"] [se.haleby/stub-http "0.2.5"]] :plugins [[lein-binplus "0.6.4" :exclusions [org.clojure/clojure]] - [lein-codox "0.10.3"] + [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.2"]] From 1d63f24995c68b497f43bc11e746021c60a794e9 Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:35:50 +0900 Subject: [PATCH 08/10] Use clojure 1.9 for the dev profile --- deploy-snapshot.sh | 2 +- project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy-snapshot.sh b/deploy-snapshot.sh index ed87ecc5..52cad2e1 100755 --- a/deploy-snapshot.sh +++ b/deploy-snapshot.sh @@ -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 diff --git a/project.clj b/project.clj index ec2ee360..0240ae83 100644 --- a/project.clj +++ b/project.clj @@ -12,7 +12,7 @@ [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"] + :profiles {:dev {:dependencies [[org.clojure/clojure "1.9.0"] [cavia "0.5.1"] [criterium "0.4.4"] [net.totakke/libra "0.1.1"] @@ -32,7 +32,7 @@ :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"] + :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"] From e5d5f7af8cfd4e4805757586ae948eed647a22e3 Mon Sep 17 00:00:00 2001 From: alumi Date: Tue, 19 Jun 2018 14:37:22 +0900 Subject: [PATCH 09/10] Add clojure 1.10.0-alpha4 and remove clojure 1.7 from CI versions --- .travis.yml | 2 +- project.clj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00148b51..8ee47dc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,9 @@ jdk: - openjdk7 env: matrix: - - VERSION='1.7' - VERSION='1.8' - VERSION='1.9' + - VERSION='1.10' script: lein with-profile dev,$VERSION test jobs: include: diff --git a/project.clj b/project.clj index 0240ae83..7cfd6a14 100644 --- a/project.clj +++ b/project.clj @@ -32,6 +32,7 @@ :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"]]} + :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"]] From b8297e00af75527dc5c91677306e439ca98cc0b5 Mon Sep 17 00:00:00 2001 From: alumi Date: Fri, 22 Jun 2018 11:28:43 +0900 Subject: [PATCH 10/10] Add some more jdks to test with --- .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ee47dc6..33797005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,24 @@ cache: directories: - $HOME/.m2 jdk: + - oraclejdk10 - oraclejdk9 - oraclejdk8 + - openjdk11 + - openjdk10 + - openjdk9 - openjdk8 - - openjdk7 env: matrix: - VERSION='1.8' - VERSION='1.9' - VERSION='1.10' -script: lein with-profile dev,$VERSION test +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