Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Update project.clj for Leiningen 2 #47

Merged
merged 3 commits into from

2 participants

@dakrone

Okay, I've updated project.clj for lein2, trying to make sure it changed as little as possible. I'm not sure whether you've used lein2, but I'll assume you haven't:

The lein-multi functionality has moved into lein2 profiles, so whereas you would have done lein multi <blah> before, now you would do:

lein all test

or

lein with-profile 1.2,dev test :benchmark

etc, etc.

Note that this change is to make the project.clj compatible only with lein2. If you would like, I'd be more than happy to make changes that allow the project.clj be compatible with both lein1 and lein2 (just let me know; it will just mean a larger project.clj file).

@ztellman ztellman merged commit a321cfd into ztellman:perf

1 check passed

Details default The Travis build passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 15 additions and 21 deletions.
  1. +2 −3 .travis.yml
  2. +13 −18 project.clj
View
5 .travis.yml
@@ -1,4 +1,3 @@
language: clojure
-before_install:
- - lein plugin install lein-multi 1.1.0
-script: lein multi test
+lein: lein2
+script: lein2 all do clean, test
View
31 project.clj
@@ -1,24 +1,19 @@
(defproject lamina "0.5.0-SNAPSHOT"
:description "event-driven data structures for clojure"
- :dependencies [[org.clojure/clojure "1.4.0"]
- [org.clojure/tools.logging "0.2.4"]
+ :min-lein-version "2.0.0"
+ :dependencies [[org.clojure/tools.logging "0.2.4"]
[useful "0.8.2"]
[potemkin "0.1.5"]
[criterium "0.3.0"]
[com.yammer.metrics/metrics-core "2.1.0"
:exclusions [org.slf4j/slf4j-api]]]
- :multi-deps {:all [[com.yammer.metrics/metrics-core "2.1.0"
- :exclusions [org.slf4j/slf4j-api]]
- [org.clojure/tools.logging "0.2.4"]
- [criterium "0.3.0"]
- [useful "0.8.4"]
- [potemkin "0.1.5"]]
- "master" [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]
- "1.2" [[org.clojure/clojure "1.2.1"]]
- "1.4" [[org.clojure/clojure "1.4.0"]]
- }
- :dev-dependencies [
- [codox "0.6.1"]]
+ :exclusions [org.clojure/contrib
+ org.clojure/clojure-contrib]
+ :profiles {:dev {:dependencies [[org.clojure/clojure "1.4.0"]]}
+ :1.2 {:dependencies [[org.clojure/clojure "1.2.1"]]}
+ :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]}}
+ :aliases {"all" ["with-profile" "1.2:dev:1.5"]}
+ :plugins [[codox "0.6.2"]]
:codox {:include [lamina.core
lamina.trace
lamina.viz
@@ -30,10 +25,10 @@
:output-dir "autodoc"}
;;:jvm-opts ["-server" "-XX:+UseConcMarkSweepGC" "-Xmx16m"]
:jvm-opts ["-server" "-XX:+UseConcMarkSweepGC" "-Xmx2g" "-XX:NewSize=1g"]
- :repositories {"sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"}
- :exclusions [org.clojure/contrib
- org.clojure/clojure-contrib]
- :test-selectors {:default #(not (some #{:wiki :benchmark :stress} (cons (:tag %) (keys %))))
+ :repositories {"sonatype-oss-public"
+ "https://oss.sonatype.org/content/groups/public/"}
+ :test-selectors {:default #(not (some #{:wiki :benchmark :stress}
+ (cons (:tag %) (keys %))))
:benchmark :benchmark
:wiki :wiki
:stress #(or (:stress %) (= :stress (:tag %)))
Something went wrong with that request. Please try again.