Merge branch 'release/1.5.0'

sritchie · Feb 12, 2016 · bbd1253 · bbd1253
2 parents ae9ac3a + 84c7fcd
commit bbd1253
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/project.clj b/project.clj
@@ -1,13 +1,14 @@
-(defproject com.twitter/carbonite "1.4.0"
+(defproject com.twitter/carbonite "1.5.0"
   :source-paths ["src/clj"]
   :java-source-paths ["src/jvm"]
   :javac-options ["-source" "1.6" "-target" "1.6"]
   :description "Write Clojure data to and from bytes using Kryo."
   :repositories {"conjars" "http://conjars.org/repo/"}
-  :dependencies [[org.clojure/clojure "1.5.1"]
-                 [com.esotericsoftware.kryo/kryo "2.21"]
-                 [com.twitter/chill-java "0.3.5"]]
+  :dependencies [[org.clojure/clojure "1.6.0"]
+                 [com.esotericsoftware/kryo "3.0.3"]
+                 [com.twitter/chill-java "0.8.0"]]
   :global-vars {*warn-on-reflection* true}
   :profiles {:1.2 {:dependencies [[org.clojure/clojure "1.2.1"]]}
              :1.3 {:dependencies [[org.clojure/clojure "1.3.0"]]}
-             :1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}})
+             :1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}
+             :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}})