Merge branch 'dev'

taoensso · Sep 17, 2015 · 2bcbcad · 2bcbcad
2 parents e8edba1 + 40b39db
commit 2bcbcad
Show file tree

Hide file tree

Showing 7 changed files with 183 additions and 154 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 > This project uses [Break Versioning](https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md) as of **Aug 16, 2014**.
 
+## v2.10.0-beta1 / 2015 Sep 17
+
+> This is a major **non-breaking** feature/performance release
+
+* **DEPRECATION NOTICE**: this will be the last major release with support for Clojure 1.4
+* **Performance**: various small performance improvements
+* **New**: dynamic `*default-freeze-compressor-selector*`, `set-default-freeze-compressor-selector!` util
+* **New**: dynamic `*custom-readers*`, `swap-custom-readers!` util
+* **New**: edn writes now override dynamic `*print-level*`, `*print-length*` for safety
+
+```clojure
+[com.taoensso/nippy "2.10.0-beta1"]
+```
+
+
 ## v2.9.1 / 2015 Sep 14
 
 > This is a hotfix release with an **important fix** for Nippy encryption users
@@ -13,7 +28,7 @@
 
 ## v2.9.0 / 2015 Jun 1
 
-> This is a major, **non-breaking** release that improves performance and makes thawing more resilient to certain failures. Identical to **v2.9.0-RC3**.
+> This is a major **non-breaking** release that improves performance and makes thawing more resilient to certain failures. Identical to **v2.9.0-RC3**.
 
 * **Robustness**: improve error handling for unthawable records
 * **Performance**: switch `doseq` -> (faster) `run!` calls

diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
 **[API docs][]** | **[CHANGELOG][]** | [other Clojure libs][] | [Twitter][] | [contact/contrib](#contact--contributing) | current [Break Version][]:
 
 ```clojure
-[com.taoensso/nippy "2.9.1"] ; Stable, see CHANGELOG for details
+[com.taoensso/nippy "2.9.1"]        ; Stable
+[com.taoensso/nippy "2.10.0-beta1"] ; Dev, see CHANGELOG for details
 ```
 
 # Nippy, a Clojure serialization library

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject com.taoensso/nippy "2.9.1"
+(defproject com.taoensso/nippy "2.10.0-beta1"
   :author "Peter Taoussanis <https://www.taoensso.com>"
   :description "Clojure serialization library"
   :url "https://github.com/ptaoussanis/nippy"
@@ -14,8 +14,8 @@
   :dependencies
   [[org.clojure/clojure      "1.4.0"]
    [org.clojure/tools.reader "0.9.2"]
-   [com.taoensso/encore      "1.32.0"]
-   [org.iq80.snappy/snappy   "0.3"]
+   [com.taoensso/encore      "1.38.0"] ; 2.x needs Clojure 1.5+
+   [org.iq80.snappy/snappy   "0.4"]
    [org.tukaani/xz           "1.5"]
    [net.jpountz.lz4/lz4      "1.3"]]
 
@@ -24,15 +24,17 @@
    :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-beta1"]]}
+   :1.7  {:dependencies [[org.clojure/clojure "1.7.0"]]}
    :test {:jvm-opts     ["-Xms1024m" "-Xmx2048m"]
           :dependencies [[expectations                  "2.1.1"]
-                         [org.clojure/test.check        "0.7.0"]
+                         [org.clojure/test.check        "0.8.2"]
                          ;; [com.cemerick/double-check  "0.6.1"]
-                         [org.clojure/data.fressian     "0.2.0"]
+                         [org.clojure/data.fressian     "0.2.1"]
                          [org.xerial.snappy/snappy-java "1.1.1.7"]]}
    :dev [:1.7 :test
-         {:plugins
+         {:dependencies
+          [[com.taoensso/encore "2.15.0"]]
+          :plugins
           [[lein-pprint       "1.1.1"]
            [lein-ancient      "0.6.7"]
            [lein-expectations "0.0.8"]