From ee9917d42a8e2629c4c7b138872bc99bf794fe90 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Sat, 29 Aug 2020 14:18:46 +0200 Subject: [PATCH] Update project.clj, bump deps --- README.md | 2 +- project.clj | 57 ++++++++++++++++++++++-------------------- src/taoensso/nippy.clj | 4 +-- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index c8e4a91..9896a34 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ Otherwise, you can reach me at [Taoensso.com]. Happy hacking! ## License Distributed under the [EPL v1.0] \(same as Clojure). -Copyright © 2012-2016 [Peter Taoussanis]. +Copyright © 2012-2020 [Peter Taoussanis]. [Taoensso.com]: https://www.taoensso.com diff --git a/project.clj b/project.clj index 4730f1e..1024630 100644 --- a/project.clj +++ b/project.clj @@ -13,42 +13,45 @@ } :dependencies - [[org.clojure/clojure "1.5.1"] - [org.clojure/tools.reader "1.3.2"] - [com.taoensso/encore "2.126.2"] + [[org.clojure/tools.reader "1.3.3"] + [com.taoensso/encore "2.127.0"] [org.iq80.snappy/snappy "0.4"] [org.tukaani/xz "1.8"] [org.lz4/lz4-java "1.7.1"]] + :plugins + [[lein-pprint "1.3.2"] + [lein-ancient "0.6.15"] + [lein-codox "0.10.7"]] + :profiles {;; :default [:base :system :user :provided :dev] :server-jvm {:jvm-opts ^:replace ["-server" "-Xms1024m" "-Xmx2048m"]} - :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]} - :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]} - :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.1"]]} - :test {:jvm-opts ["-Xms1024m" "-Xmx2048m" - "-Dtaoensso.nippy.serializable-whitelist-base=base.1, base.2" - "-Dtaoensso.nippy.serializable-whitelist-add=add.1 , add.2"] - :dependencies [[org.clojure/test.check "1.1.0"] - [org.clojure/data.fressian "1.0.0"] - [org.xerial.snappy/snappy-java "1.1.7.6"]]} - :dev [:1.10 :test :server-jvm - {:plugins - [[lein-pprint "1.3.2"] - [lein-ancient "0.6.15"] - [lein-codox "0.10.7"]]}]} + :provided {:dependencies [[org.clojure/clojure "1.5.1"]]} + :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]} + :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]} + :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.1"]]} + :depr {:jvm-opts ["-Dtaoensso.elide-deprecated=true"]} + :test + {:jvm-opts + ["-Xms1024m" "-Xmx2048m" + "-Dtaoensso.nippy.serializable-whitelist-base=base.1, base.2" + "-Dtaoensso.nippy.serializable-whitelist-add=add.1 , add.2"] + :dependencies + [[org.clojure/test.check "1.1.0"] + [org.clojure/data.fressian "1.0.0"] + [org.xerial.snappy/snappy-java "1.1.7.7"]]} - :codox - {:language :clojure - :source-uri "https://github.com/ptaoussanis/nippy/blob/master/{filepath}#L{line}"} + :dev [:1.10 :test :server-jvm :depr]} :aliases - {"test-all" ["with-profile" "+1.10:+1.9:+1.8:+1.7:+1.6:+1.5" "test"] + {"start-dev" ["with-profile" "+dev" "repl" ":headless"] "deploy-lib" ["do" "deploy" "clojars," "install"] - "start-dev" ["with-profile" "+dev" "repl" ":headless"]} + "test-all" ["with-profile" "+1.10:+1.9:+1.8:+1.7:+1.6:+1.5" "test"]} - :repositories {"sonatype-oss-public" - "https://oss.sonatype.org/content/groups/public/"}) + :repositories + {"sonatype-oss-public" + "https://oss.sonatype.org/content/groups/public/"}) diff --git a/src/taoensso/nippy.clj b/src/taoensso/nippy.clj index cf4b2ab..536573a 100644 --- a/src/taoensso/nippy.clj +++ b/src/taoensso/nippy.clj @@ -25,8 +25,8 @@ LazySeq IRecord ISeq IType])) (if (vector? enc/encore-version) - (enc/assert-min-encore-version [2 124 0]) - (enc/assert-min-encore-version 2.124)) + (enc/assert-min-encore-version [2 126 2]) + (enc/assert-min-encore-version 2.126)) (comment (set! *unchecked-math* :warn-on-boxed)