Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #47 from dakrone/perf
Browse files Browse the repository at this point in the history
Update project.clj for Leiningen 2
  • Loading branch information
ztellman committed Nov 28, 2012
2 parents b022a5f + d0e8fd4 commit a321cfd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 21 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,3 @@
language: clojure language: clojure
before_install: lein: lein2
- lein plugin install lein-multi 1.1.0 script: lein2 all do clean, test
script: lein multi test
31 changes: 13 additions & 18 deletions project.clj
Original file line number Original file line Diff line number Diff line change
@@ -1,24 +1,19 @@
(defproject lamina "0.5.0-SNAPSHOT" (defproject lamina "0.5.0-SNAPSHOT"
:description "event-driven data structures for clojure" :description "event-driven data structures for clojure"
:dependencies [[org.clojure/clojure "1.4.0"] :min-lein-version "2.0.0"
[org.clojure/tools.logging "0.2.4"] :dependencies [[org.clojure/tools.logging "0.2.4"]
[useful "0.8.2"] [useful "0.8.2"]
[potemkin "0.1.5"] [potemkin "0.1.5"]
[criterium "0.3.0"] [criterium "0.3.0"]
[com.yammer.metrics/metrics-core "2.1.0" [com.yammer.metrics/metrics-core "2.1.0"
:exclusions [org.slf4j/slf4j-api]]] :exclusions [org.slf4j/slf4j-api]]]
:multi-deps {:all [[com.yammer.metrics/metrics-core "2.1.0" :exclusions [org.clojure/contrib
:exclusions [org.slf4j/slf4j-api]] org.clojure/clojure-contrib]
[org.clojure/tools.logging "0.2.4"] :profiles {:dev {:dependencies [[org.clojure/clojure "1.4.0"]]}
[criterium "0.3.0"] :1.2 {:dependencies [[org.clojure/clojure "1.2.1"]]}
[useful "0.8.4"] :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}}
[potemkin "0.1.5"]] :aliases {"all" ["with-profile" "1.2:dev:1.5"]}
"master" [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]] :plugins [[codox "0.6.2"]]
"1.2" [[org.clojure/clojure "1.2.1"]]
"1.4" [[org.clojure/clojure "1.4.0"]]
}
:dev-dependencies [
[codox "0.6.1"]]
:codox {:include [lamina.core :codox {:include [lamina.core
lamina.trace lamina.trace
lamina.viz lamina.viz
Expand All @@ -30,10 +25,10 @@
:output-dir "autodoc"} :output-dir "autodoc"}
;;:jvm-opts ["-server" "-XX:+UseConcMarkSweepGC" "-Xmx16m"] ;;:jvm-opts ["-server" "-XX:+UseConcMarkSweepGC" "-Xmx16m"]
:jvm-opts ["-server" "-XX:+UseConcMarkSweepGC" "-Xmx2g" "-XX:NewSize=1g"] :jvm-opts ["-server" "-XX:+UseConcMarkSweepGC" "-Xmx2g" "-XX:NewSize=1g"]
:repositories {"sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"} :repositories {"sonatype-oss-public"
:exclusions [org.clojure/contrib "https://oss.sonatype.org/content/groups/public/"}
org.clojure/clojure-contrib] :test-selectors {:default #(not (some #{:wiki :benchmark :stress}
:test-selectors {:default #(not (some #{:wiki :benchmark :stress} (cons (:tag %) (keys %)))) (cons (:tag %) (keys %))))
:benchmark :benchmark :benchmark :benchmark
:wiki :wiki :wiki :wiki
:stress #(or (:stress %) (= :stress (:tag %))) :stress #(or (:stress %) (= :stress (:tag %)))
Expand Down

0 comments on commit a321cfd

Please sign in to comment.