pass compiler options to cljs.env/default-compiler-env, necessary sta…

…rting w/ ClojureScript 0.0-2197
emezeske · Apr 1, 2014 · 8bd20c9 · 8bd20c9
1 parent f8c3d2c
commit 8bd20c9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/cljs-compat/src/cljsbuild/compat.clj b/cljs-compat/src/cljsbuild/compat.clj
@@ -1,7 +1,9 @@
 (ns cljsbuild.compat
   (:use clojure.test))
 
-(def matrix {"1.0.3-SNAPSHOT" {:cljs ["0.0-2014"]}
+; ranges are *inclusive* on both ends
+(def matrix {"1.0.3" {:cljs ["0.0-2197"]}
+             "1.0.3-SNAPSHOT" {:cljs ["0.0-2197"]}
              "1.0.2" {:cljs ["0.0-2014"]}
              "1.0.2-SNAPSHOT" {:cljs ["0.0-2014"]}
              "1.0.1" {:cljs ["0.0-2014"]}

diff --git a/example-projects/advanced/project.clj b/example-projects/advanced/project.clj
@@ -2,7 +2,7 @@
   :description "An advanced example of how to use lein-cljsbuild"
   :source-paths ["src-clj"]
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-2014"
+                 [org.clojure/clojurescript "0.0-2197"
                   :exclusions [org.apache.ant/ant]]
                  [compojure "1.1.6"]
                  [hiccup "1.0.4"]]

diff --git a/example-projects/simple/project.clj b/example-projects/simple/project.clj
@@ -2,7 +2,7 @@
   :description "A simple example of how to use lein-cljsbuild"
   :source-paths ["src-clj"]
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/clojurescript "0.0-2014"
+                 [org.clojure/clojurescript "0.0-2197"
                   :exclusions [org.apache.ant/ant]]
                  [compojure "1.1.6"]
                  [hiccup "1.0.4"]]

diff --git a/plugin/src/leiningen/cljsbuild.clj b/plugin/src/leiningen/cljsbuild.clj
@@ -64,7 +64,8 @@
           (when ~watch?
             (cljsbuild.util/once-every-bg 1000 "copying crossovers" copy-crossovers#))
           (let [crossover-macro-paths# (cljsbuild.crossover/crossover-macro-paths '~crossovers)
-                builds# (map vector '~parsed-builds (repeatedly cljs.env/default-compiler-env))]
+                builds# (for [opts# '~parsed-builds]
+                          [opts# (cljs.env/default-compiler-env (:compiler opts#))])]
             (loop [dependency-mtimes# (repeat (count builds#) {})]
               (let [builds-mtimes# (map vector builds# dependency-mtimes#)
                     new-dependency-mtimes#

diff --git a/support/project.clj b/support/project.clj
@@ -7,7 +7,7 @@
      :distribution :repo}
   :dependencies
     [[org.clojure/clojure "1.5.1"]
-     [org.clojure/clojurescript "0.0-2156"
+     [org.clojure/clojurescript "0.0-2197"
        :exclusions [org.apache.ant/ant]]
      [fs "1.1.2"]
      [clj-stacktrace "0.2.5"]]