Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'dev'

  • Loading branch information...
commit 43c329a2fa5e1d093c2eeb4bfd78be0de984a15a 2 parents 9085614 + 26c1686
@ptaoussanis authored
Showing with 21 additions and 13 deletions.
  1. +1 −1  CHANGELOG.md
  2. +4 −1 README.md
  3. +16 −11 project.clj
View
2  CHANGELOG.md
@@ -1,4 +1,4 @@
-## v2.6.0-beta1 / 2014 Feb 23
+## v2.6.0-beta2 / 2014 Feb 26
> Welcoming feedback on any issues, etc.!
View
5 README.md
@@ -2,7 +2,7 @@
```clojure
[com.taoensso/nippy "2.5.2"] ; Stable
-[com.taoensso/nippy "2.6.0-beta1"] ; For early adopters
+[com.taoensso/nippy "2.6.0-beta2"] ; For early adopters
```
v2.6 will be a backwards-compatible release with: improved performance (incl. frozen data size), a new low-level DataInput/DataOuput API, improved support for headerless freezing, and 1-to-1 binary-value representation guarantees. See the [Changelog](https://github.com/ptaoussanis/nippy/blob/master/CHANGELOG.md) for details.
@@ -157,6 +157,8 @@ There's two default forms of encryption on offer: `:salted` and `:cached`. Each
## Contact & contributing
+`lein start-dev` to get a (headless) development repl that you can connect to with [Cider][] (emacs) or your IDE.
+
Please use the project's GitHub [issues page][] for project questions/comments/suggestions/whatever **(pull requests welcome!)**. Am very open to ideas if you have any!
Otherwise reach me (Peter Taoussanis) at [taoensso.com][] or on [Twitter][]. Cheers!
@@ -176,5 +178,6 @@ Copyright © 2012-2014 Peter Taoussanis. Distributed under the [Eclipse Publ
[ClojureWerkz]: <http://clojurewerkz.org/>
[issues page]: <https://github.com/ptaoussanis/nippy/issues>
[commit history]: <https://github.com/ptaoussanis/nippy/commits/master>
+[Cider]: <https://github.com/clojure-emacs/cider>
[taoensso.com]: <https://www.taoensso.com>
[Eclipse Public License]: <https://raw2.github.com/ptaoussanis/nippy/master/LICENSE>
View
27 project.clj
@@ -1,4 +1,4 @@
-(defproject com.taoensso/nippy "2.6.0-beta1"
+(defproject com.taoensso/nippy "2.6.0-beta2"
:author "Peter Taoussanis <https://www.taoensso.com>"
:description "Clojure serialization library"
:url "https://github.com/ptaoussanis/nippy"
@@ -12,22 +12,25 @@
:dependencies
[[org.clojure/clojure "1.4.0"]
[org.clojure/tools.reader "0.8.3"]
+ [com.taoensso/encore "0.9.2"]
[org.iq80.snappy/snappy "0.3"]
- [org.tukaani/xz "1.4"]
- [com.taoensso/encore "0.8.0"]]
+ [org.tukaani/xz "1.4"]]
:test-paths ["test" "src"]
:profiles
- {:build {:hooks ^:replace []} ; Workaround to avoid :dev hooks during deploy
+ {;; :default [:base :system :user :provided :dev]
:1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}
:1.6 {:dependencies [[org.clojure/clojure "1.6.0-beta1"]]}
:test {:jvm-opts ["-Xms1024m" "-Xmx2048m"]
:dependencies [[expectations "1.4.56"]
[reiddraper/simple-check "0.5.6"]
- [org.xerial.snappy/snappy-java "1.1.1-M1"]
- [org.clojure/data.fressian "0.2.0"]]
+ [org.clojure/data.fressian "0.2.0"]
+ [org.xerial.snappy/snappy-java "1.1.1-M1"]]
:plugins [[lein-expectations "0.0.8"]
[lein-autoexpect "1.2.2"]]}
+ :dev* [:dev {:jvm-opts ^:replace ["-server"]
+ ;; :hooks [cljx.hooks leiningen.cljsbuild] ; cljx
+ }]
:dev
[:1.6 :test
{:jvm-opts ^:replace ["-server" "-Xms1024m" "-Xmx2048m"]
@@ -38,13 +41,15 @@
:plugins [[lein-ancient "0.5.4"]
[codox "0.6.7"]]
- ;; :codox {:sources ["target/classes"]} ; For use with cljx
+ ;; :codox {:sources ["target/classes"]} ; cljx
:aliases
- {"test-all" ["with-profile" "+test:+1.5,+test:+1.6,+test" "expectations"]
+ {"test-all" ["with-profile" "default:+1.5:+1.6" "expectations"]
+ ;; "test-all" ["with-profile" "default:+1.6" "expectations"]
"test-auto" ["with-profile" "+test" "autoexpect"]
- "start-dev" ["with-profile" "+dev" "repl" ":headless"]
- "codox" ["with-profile" "+test" "doc"]
- "deploy-lib" ["with-profile" "+dev,+build" "do" "deploy" "clojars," "install"]}
+ ;; "build-once" ["do" "cljx" "once," "cljsbuild" "once"] ; cljx
+ ;; "deploy-lib" ["do" "build-once," "deploy" "clojars," "install"] ; cljx
+ "deploy-lib" ["do" "deploy" "clojars," "install"]
+ "start-dev" ["with-profile" "+dev*" "repl" ":headless"]}
:repositories
{"sonatype"
Please sign in to comment.
Something went wrong with that request. Please try again.