From a3847a481892b6bfdce7a06ac80d84bf009e7788 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Thu, 17 Sep 2015 10:55:09 +0700 Subject: [PATCH] Misc housekeeping --- project.clj | 2 +- src/taoensso/nippy.clj | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/project.clj b/project.clj index 6bef8d9..82aed6e 100644 --- a/project.clj +++ b/project.clj @@ -33,7 +33,7 @@ [org.xerial.snappy/snappy-java "1.1.1.7"]]} :dev [:1.7 :test {:dependencies - [[com.taoensso/encore "2.13.0"]] + [[com.taoensso/encore "2.15.0"]] :plugins [[lein-pprint "1.1.1"] [lein-ancient "0.6.7"] diff --git a/src/taoensso/nippy.clj b/src/taoensso/nippy.clj index f15a4d9..6180f20 100644 --- a/src/taoensso/nippy.clj +++ b/src/taoensso/nippy.clj @@ -1,7 +1,7 @@ (ns taoensso.nippy "High-performance JVM Clojure serialization library. Originally adapted from - Deep-Freeze." - {:author "Peter Taoussanis"} + Deep-Freeze (https://goo.gl/OePPGr)." + {:author "Peter Taoussanis (@ptaoussanis)"} (:require [taoensso.encore :as encore] [taoensso.nippy (utils :as utils) @@ -18,17 +18,9 @@ PersistentQueue PersistentTreeMap PersistentTreeSet PersistentList ; LazySeq IRecord ISeq])) -;;;; Encore version check - -(let [min-encore-version 1.38] - (if-let [assert! (ns-resolve 'taoensso.encore 'assert-min-encore-version)] - (assert! min-encore-version) - (throw - (ex-info - (format - "Insufficient com.taoensso/encore version (< %s). You may have a Leiningen dependency conflict (see http://goo.gl/qBbLvC for solution)." - min-encore-version) - {:min-version min-encore-version})))) +(if (vector? taoensso.encore/encore-version) + (encore/assert-min-encore-version [1 38 0]) ; Note v1.x for Clojure 1.4 support + (encore/assert-min-encore-version 1.38)) ;;;; Nippy data format ;; * 4-byte header (Nippy v2.x+) (may be disabled but incl. by default) [1].