[all] update cljsbuild dependency, update all lein project files

thi-ng · May 25, 2015 · 337e630 · 337e630
1 parent 698a9c3
commit 337e630
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 45 deletions.
diff --git a/geom-core/src/index.org b/geom-core/src/index.org
@@ -82,9 +82,6 @@ target/geom-core-<<conf-version()>>.js
                    <<dep-math>>
                    <<dep-dstruct>>]
 
-    :source-paths ["src"]
-    :test-paths   ["test"]
-
     :perforate {:environments [{:namespaces [thi.ng.geom.bench.core.vector]}]}
 
     :profiles     {:dev {:dependencies [<<dep-perforate-x>>]

diff --git a/geom-meshops/src/index.org b/geom-meshops/src/index.org
@@ -64,9 +64,6 @@ target/geom-meshops-<<conf-version()>>.js
                    [thi.ng/geom-core "<<conf-version()>>"]
                    [thi.ng/geom-types "<<conf-version()>>"]]
 
-    :source-paths ["src"]
-    :test-paths   ["test"]
-
     :profiles     {:dev {:dependencies [<<dep-criterium>>]
                          :plugins      [<<dep-cljsbuild>>
                                         <<dep-cljs-test>>]

diff --git a/geom-physics/src/index.org b/geom-physics/src/index.org
@@ -55,37 +55,18 @@ target/geom-physics-<<conf-version()>>.js
     :min-lein-version "2.4.0"
 
     :dependencies [<<dep-clj>>
+                   <<dep-cljs>>
                    [thi.ng/geom-core "<<conf-version()>>"]
                    [thi.ng/geom-types "<<conf-version()>>"]]
 
-    :source-paths ["src/cljx"]
-    :test-paths   ["<<conf-gen-test-path>>"]
-
-    :profiles     {:dev {:dependencies [<<dep-cljs>>
-                                        <<dep-criterium>>]
-                         :plugins      [<<dep-cljx>>
-                                        <<dep-cljsbuild>>
+    :profiles     {:dev {:dependencies [<<dep-criterium>>]
+                         :plugins      [<<dep-cljsbuild>>
                                         <<dep-cljs-test>>]
                          :global-vars {*warn-on-reflection* true}
                          :jvm-opts ^:replace []
-                         :auto-clean false
-                         :prep-tasks [["cljx" "once"]]
-                         :aliases {"cleantest" ["do" "clean," "cljx" "once," "test," "cljsbuild" "test"]}}}
-
-    :cljx         {:builds [{:source-paths ["src/cljx"]
-                             :output-path "<<conf-gen-source-path>>"
-                             :rules :clj}
-                            {:source-paths ["src/cljx"]
-                             :output-path "<<conf-gen-source-path>>"
-                             :rules :cljs}
-                            {:source-paths ["test/cljx"]
-                             :output-path "<<conf-gen-test-path>>"
-                             :rules :clj}
-                            {:source-paths ["test/cljx"]
-                             :output-path "<<conf-gen-test-path>>"
-                             :rules :cljs}]}
-
-    :cljsbuild    {:builds [{:source-paths ["<<conf-gen-source-path>>" "<<conf-gen-test-path>>"]
+                         :aliases {"cleantest" ["do" "clean," "test," "cljsbuild" "test"]}}}
+
+    :cljsbuild    {:builds [{:source-paths ["src" "test"]
                              :id "simple"
                              :compiler {:output-to "<<cljs-artefact-path>>"
                                         :optimizations :whitespace
@@ -126,7 +107,7 @@ symbol =version= holding the version string defined above:
 
 *** Version namespace                                              :noexport:
 
-#+BEGIN_SRC clojure :tangle ../babel/src/cljx/thi/ng/geom/physics/version.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/physics/version.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.physics.version)
   (def version "<<conf-version()>>")
 #+END_SRC

diff --git a/geom-svg/src/index.org b/geom-svg/src/index.org
@@ -70,12 +70,10 @@ target/geom-svg-<<conf-version()>>.js
                    [thi.ng/geom-core "<<conf-version()>>"]
                    [thi.ng/geom-types "<<conf-version()>>"]
                    [thi.ng/geom-meshops "<<conf-version()>>"]
+                   <<dep-strf>>
                    <<dep-color>>
                    <<dep-hiccup>>]
 
-    :source-paths ["src"]
-    :test-paths   ["test"]
-
     :profiles     {:dev {:dependencies [<<dep-criterium>>]
                          :plugins      [<<dep-cljsbuild>>
                                         <<dep-cljs-test>>]

diff --git a/geom-types/src/index.org b/geom-types/src/index.org
@@ -122,9 +122,6 @@ target/geom-types-<<conf-version()>>.js
                    <<dep-cljs>>
                    [thi.ng/geom-core "<<conf-version()>>"]]
 
-    :source-paths ["src"]
-    :test-paths   ["test"]
-
     :profiles     {:dev {:dependencies [<<dep-criterium>>]
                          :plugins      [<<dep-cljsbuild>>
                                         <<dep-cljs-test>>]

diff --git a/src/config.org b/src/config.org
@@ -76,16 +76,10 @@ target/test-classes
 #+END_SRC
 
 *** Development
-**** [[https://github.com/lynaghk/cljx][Cljx]]
-#+NAME: dep-cljx
-#+BEGIN_SRC clojure
-[com.keminglabs/cljx "0.6.0"]
-#+END_SRC
-
 **** [[https://github.com/emezeske/lein-cljsbuild][Cljsbuild]]
 #+NAME: dep-cljsbuild
 #+BEGIN_SRC clojure
-[lein-cljsbuild "1.0.5"]
+[lein-cljsbuild "1.0.6"]
 #+END_SRC
 
 **** [[https://github.com/hugoduncan/criterium][Criterium]]
@@ -99,21 +93,25 @@ target/test-classes
 #+BEGIN_SRC clojure
 [com.cemerick/clojurescript.test "0.3.3"]
 #+END_SRC
+
 **** [[https://github.com/davidsantiago/perforate][perforate]]
 #+NAME: dep-perforate
 #+BEGIN_SRC clojure
 [perforate "0.3.4"]
 #+END_SRC
+
 **** [[https://github.com/postspectacular/perforate-x][perforate-x]]
 #+NAME: dep-perforate-x
 #+BEGIN_SRC clojure
 [perforate-x "0.1.0"]
 #+END_SRC
+
 **** [[https://github.com/RyanMcG/lein-npm][lein-npm]]
 #+NAME: dep-lein-npm
 #+BEGIN_SRC clojure
 [lein-npm "0.5.0"]
 #+END_SRC
+
 **** [[https://www.npmjs.com/package/benchmark][node benchmark]]
 #+NAME: dep-npm-benchmark
 #+BEGIN_SRC clojure