diff --git a/.travis.yml b/.travis.yml index c764079..81aec5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: clojure -before_install: lein plugin install lein-multi 1.1.0 -before_script: ./bin/ci/before_script.sh -script: lein multi test +lein: lein2 +before_script: + - ./bin/ci/before_script.sh +script: lein2 with-profile dev:1.4 test diff --git a/ChangeLog.md b/ChangeLog.md index 06ecc78..ce145b4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -45,6 +45,10 @@ Here is what it feels like: (seed "pages" "http://clojure.org/rationale") ``` +### Leiningen 2 + +Monger now uses [Leiningen 2](https://github.com/technomancy/leiningen/wiki/Upgrading). + ### monger.core/set-connection! diff --git a/README.md b/README.md index acac3af..d8621e1 100644 --- a/README.md +++ b/README.md @@ -361,13 +361,9 @@ Neocons is part of the group of libraries known as ClojureWerkz, together with ## Development -Install [lein-multi](https://github.com/maravillas/lein-multi) with +Monger uses [Leiningen 2](https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md). Make sure you have it installed and then run tests against Clojure 1.3.0 and 1.4.0[-beta4] using - lein plugin install lein-multi 1.1.0 - -then run tests against Clojure 1.3.0 and 1.4.0[-beta1] using - - lein multi test + lein2 with-profile test:1.4 test Then create a branch and make your changes on it. Once you are done with your changes and all tests pass, submit a pull request on Github. diff --git a/project.clj b/project.clj index d7c0ac7..48d2809 100644 --- a/project.clj +++ b/project.clj @@ -1,27 +1,29 @@ (defproject com.novemberain/monger "1.0.0-SNAPSHOT" :description "Monger is an experimental idiomatic Clojure wrapper around MongoDB Java driver" - :license { :name "Eclipse Public License" } - :mailing-list {:name "clojure-monger" - :archive "https://groups.google.com/group/clojure-monger" - :post "clojure-monger@googlegroups.com"} - :repositories { "sonatype" - {:url "http://oss.sonatype.org/content/repositories/releases" - :snapshots false - :releases {:checksum :fail :update :always} - }} - :dependencies [[org.clojure/clojure "1.3.0"] + :min-lein-version "2.0.0" + :license {:name "Eclipse Public License"} + :dependencies [[org.clojure/clojure "1.3.0"] [org.mongodb/mongo-java-driver "2.7.3"] - [com.novemberain/validateur "1.0.0"]] - :multi-deps { - "1.4" [[org.clojure/clojure "1.4.0-beta1"]] - :all [[org.mongodb/mongo-java-driver "2.7.3"] - [com.novemberain/validateur "1.0.0"]] - } - :dev-dependencies [[org.clojure/data.json "0.1.2" :exclusions [org.clojure/clojure]] - [clj-time "0.3.6" :exclusions [org.clojure/clojure]] - [codox "0.3.4" :exclusions [org.clojure/clojure]] - [org.clojure/tools.cli "0.2.1" :exclusions [org.clojure/clojure]]] - :dev-resources-path "test/resources" - :warn-on-reflection true - :codox { :exclude [monger.internal.pagination] } - :test-selectors {:focus (fn [v] (:focus v))}) + [com.novemberain/validateur "1.0.0"]] + :test-selectors {:focus (fn [v] (:focus v))} + :codox {:exclude [monger.internal.pagination]} + :mailing-list {:name "clojure-monger", + :archive "https://groups.google.com/group/clojure-monger", + :post "clojure-monger@googlegroups.com"} + :profiles {:all {:dependencies [[org.mongodb/mongo-java-driver "2.7.3"] + [com.novemberain/validateur "1.0.0"]]}, + :1.4 {:resource-paths ["test/resources"], + :dependencies [[org.clojure/clojure "1.4.0-beta4"] + [org.clojure/data.json "0.1.2" :exclusions [org.clojure/clojure]] + [clj-time "0.3.6" :exclusions [org.clojure/clojure]] + [codox "0.3.4" :exclusions [org.clojure/clojure]] + [org.clojure/tools.cli "0.2.1" :exclusions [org.clojure/clojure]]]}, + :dev {:resource-paths ["test/resources"], + :dependencies [[org.clojure/data.json "0.1.2" :exclusions [org.clojure/clojure]] + [clj-time "0.3.6" :exclusions [org.clojure/clojure]] + [codox "0.3.4" :exclusions [org.clojure/clojure]] + [org.clojure/tools.cli "0.2.1" :exclusions [org.clojure/clojure]]]}} + :repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases", + :snapshots false, + :releases {:checksum :fail, :update :always}}} + :warn-on-reflection true) \ No newline at end of file diff --git a/test/monger/test/core.clj b/test/monger/test/core.clj index 12fbfc5..29a5803 100644 --- a/test/monger/test/core.clj +++ b/test/monger/test/core.clj @@ -6,6 +6,7 @@ (:use [clojure.test] [monger.core :only [server-address mongo-options]])) +(println (str "Using Clojure version " *clojure-version*)) (helper/connect!) (deftest connect-to-mongo-with-default-host-and-port