Skip to content

Commit

Permalink
Removed lein1 support :(
Browse files Browse the repository at this point in the history
  • Loading branch information
dgrnbrg committed Oct 2, 2012
1 parent dbc72df commit 204fe0a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
@@ -1,9 +1,7 @@
language: clojure
lein: lein2

before_install:
- lein2 deps

script: lein install, test
script: lein install; cd lein-guzheng; lein install; cd ..; lein test

branches:
only:
Expand Down
6 changes: 4 additions & 2 deletions test-project/project.clj
@@ -1,10 +1,12 @@
(defproject test-project "1.0.0-SNAPSHOT"
:dependencies [[org.clojure/clojure "1.4.0"]
[guzheng "1.2.5"]
[sleight "0.2.0-SNAPSHOT"]]
]

;; Lein 1
:dev-dependencies [[lein-guzheng ~(nth (read-string (slurp "../lein-guzheng/project.clj")) 2)]]
; :dev-dependencies [[lein-guzheng ~(nth (read-string (slurp "../lein-guzheng/project.clj")) 2)]
; [lein-sleight "0.2.0-SNAPSHOT"]
; ]

;; Lein 2
:plugins [[lein-guzheng ~(nth (read-string (slurp "../lein-guzheng/project.clj")) 2) ]
Expand Down
7 changes: 5 additions & 2 deletions test/guzheng/test/core.clj
Expand Up @@ -27,7 +27,10 @@ in ns foo.core: body is not covered in \"delay\" on line 95
in ns foo.core: arity [x] is not covered in \"defmethod for dispatch value :a\" on line 104
")

(deftest test-lein1
(comment
deprecated for now

(deftest test-lein1
(let [{:keys [err out exit]}
(sh "lein" "clean," "deps," "version" :dir "test-project")]
(println out)
Expand All @@ -37,7 +40,7 @@ in ns foo.core: arity [x] is not covered in \"defmethod for dispatch value :a\"
(sh "lein" "guzheng" "foo.core" "--" "test" :dir "test-project")]
(println out)
(is (= 0 exit))
(is (.endsWith out expected-output))))
(is (.endsWith out expected-output)))))

(deftest test-lein2
(let [{:keys [err out exit]}
Expand Down

0 comments on commit 204fe0a

Please sign in to comment.