upgrade to ClojureScript 1.9.542 (#162)

anmonteiro · May 13, 2017 · c27e645 · c27e645
1 parent 1b8d394
commit c27e645
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ### Changes
 
 - Upgrade Node.js to version 7.10.0.
+- Upgrade ClojureScript to version 1.9.542.
 
 ### Bug fixes
 

diff --git a/build.boot b/build.boot
@@ -2,7 +2,7 @@
  :source-paths #{"src/cljs/snapshot"}
  :asset-paths #{"src/js" "src/cljs/bundled"}
  :dependencies '[[org.clojure/clojure         "1.9.0-alpha16"]
-                 [org.clojure/clojurescript   "1.9.521"]
+                 [org.clojure/clojurescript   "1.9.542"]
                  [org.clojure/tools.reader    "1.0.0-beta4"]
                  [com.cognitect/transit-cljs  "0.8.239"]
                  [malabarba/lazy-map          "1.3"]

diff --git a/scripts/aot-bundle-macros.bat b/scripts/aot-bundle-macros.bat
@@ -11,7 +11,7 @@ echo "### Compiling Macro Namespaces"
 
 mkdir lumo-cljs\out\macros-tmp || goto :error
 
-echo (require 'lumo.build.api 'lumo.analyzer 'lumo.cljs-deps 'lumo.classpath 'lumo.closure 'lumo.compiler 'lumo.io 'lumo.json 'lumo.util 'clojure.core.reducers 'clojure.zip 'clojure.data 'cljs.nodejs 'cljs.pprint 'cljs.test 'cljs.analyzer.api) (require-macros 'lumo.repl 'lumo.util 'clojure.template 'cljs.pprint 'cljs.support 'cljs.spec 'cljs.spec.impl.gen 'cljs.test 'cljs.reader 'cljs.env.macros 'cljs.analyzer.macros 'cljs.compiler.macros) | build\lumo.exe --quiet -c target -sdk lumo-cljs/out/macros-tmp || goto :error
+echo (require 'lumo.build.api 'lumo.analyzer 'lumo.cljs-deps 'lumo.classpath 'lumo.closure 'lumo.compiler 'lumo.io 'lumo.json 'lumo.util 'clojure.core.reducers 'clojure.zip 'clojure.data 'cljs.nodejs 'cljs.pprint 'cljs.test 'cljs.analyzer.api) (require-macros 'lumo.repl 'lumo.util 'clojure.template 'cljs.pprint 'cljs.support 'cljs.spec.alpha 'cljs.spec.gen.alpha 'cljs.test 'cljs.reader 'cljs.env.macros 'cljs.analyzer.macros 'cljs.compiler.macros) | build\lumo.exe --quiet -c target -sdk lumo-cljs/out/macros-tmp || goto :error
 
 mv lumo-cljs\out\macros-tmp\clojure_SLASH_core_SLASH_reducers.js target\clojure\core\reducers.js || goto :error
 mv lumo-cljs\out\macros-tmp\clojure_SLASH_core_SLASH_reducers.cache.json target\clojure\core\reducers.cache.json || goto :error
@@ -68,10 +68,10 @@ mv lumo-cljs\out\macros-tmp\cljs_SLASH_reader$macros.js target\cljs\reader$macro
 mv lumo-cljs\out\macros-tmp\cljs_SLASH_reader$macros.cache.json target\cljs\reader$macros.cache.json || goto :error
 mv lumo-cljs\out\macros-tmp\cljs_SLASH_tools_SLASH_reader_SLASH_reader_types$macros.cache.json target\cljs\tools\reader\reader_types$macros.cache.json  || goto :error
 mv lumo-cljs\out\macros-tmp\cljs_SLASH_tools_SLASH_reader_SLASH_reader_types$macros.js target\cljs\tools\reader\reader_types$macros.js || goto :error
-mv lumo-cljs\out\macros-tmp\cljs_SLASH_spec$macros.js target\cljs\spec$macros.js || goto :error
-mv lumo-cljs\out\macros-tmp\cljs_SLASH_spec$macros.cache.json target\cljs\spec$macros.cache.json || goto :error
-mv lumo-cljs\out\macros-tmp\cljs_SLASH_spec_SLASH_impl_SLASH_gen$macros.js target\cljs\spec\impl\gen$macros.js || goto :error
-mv lumo-cljs\out\macros-tmp\cljs_SLASH_spec_SLASH_impl_SLASH_gen$macros.cache.json target\cljs\spec\impl\gen$macros.cache.json || goto :error
+mv lumo-cljs\out\macros-tmp\cljs_SLASH_spec_SLASH_alpha$macros.js target\cljs\spec\alpha$macros.js || goto :error
+mv lumo-cljs\out\macros-tmp\cljs_SLASH_spec_SLASH_alpha$macros.cache.json target\cljs\spec\alpha$macros.cache.json || goto :error
+mv lumo-cljs\out\macros-tmp\cljs_SLASH_spec_SLASH_gen_SLASH_alpha$macros.js target\cljs\spec\gen\alpha$macros.js || goto :error
+mv lumo-cljs\out\macros-tmp\cljs_SLASH_spec_SLASH_gen_SLASH_alpha$macros.cache.json target\cljs\spec\gen\alpha$macros.cache.json || goto :error
 
 echo y | rd lumo-cljs /s
 

diff --git a/scripts/aot-bundle-macros.sh b/scripts/aot-bundle-macros.sh
@@ -34,8 +34,8 @@ $(pwd)/build/lumo --quiet -c target -sdk lumo-cljs/out/macros-tmp <<REPL_INPUT
                 'lumo.util
                 'clojure.template
                 'cljs.pprint
-                'cljs.spec
-                'cljs.spec.impl.gen
+                'cljs.spec.alpha
+                'cljs.spec.gen.alpha
                 'cljs.support
                 'cljs.test
                 'cljs.reader
@@ -100,9 +100,9 @@ mv lumo-cljs/out/macros-tmp/cljs_SLASH_reader\$macros.js target/cljs/reader\$mac
 mv lumo-cljs/out/macros-tmp/cljs_SLASH_reader\$macros.cache.json target/cljs/reader\$macros.cache.json
 mv lumo-cljs/out/macros-tmp/cljs_SLASH_tools_SLASH_reader_SLASH_reader_types\$macros.cache.json target/cljs/tools/reader/reader_types\$macros.cache.json
 mv lumo-cljs/out/macros-tmp/cljs_SLASH_tools_SLASH_reader_SLASH_reader_types\$macros.js target/cljs/tools/reader/reader_types\$macros.js
-mv lumo-cljs/out/macros-tmp/cljs_SLASH_spec\$macros.js target/cljs/spec\$macros.js
-mv lumo-cljs/out/macros-tmp/cljs_SLASH_spec\$macros.cache.json target/cljs/spec\$macros.cache.json
-mv lumo-cljs/out/macros-tmp/cljs_SLASH_spec_SLASH_impl_SLASH_gen\$macros.js target/cljs/spec/impl/gen\$macros.js
-mv lumo-cljs/out/macros-tmp/cljs_SLASH_spec_SLASH_impl_SLASH_gen\$macros.cache.json target/cljs/spec/impl/gen\$macros.cache.json
+mv lumo-cljs/out/macros-tmp/cljs_SLASH_spec_SLASH_alpha\$macros.js target/cljs/spec/alpha\$macros.js
+mv lumo-cljs/out/macros-tmp/cljs_SLASH_spec_SLASH_alpha\$macros.cache.json target/cljs/spec/alpha\$macros.cache.json
+mv lumo-cljs/out/macros-tmp/cljs_SLASH_spec_SLASH_gen_SLASH_alpha\$macros.js target/cljs/spec/gen/alpha\$macros.js
+mv lumo-cljs/out/macros-tmp/cljs_SLASH_spec_SLASH_gen_SLASH_alpha\$macros.cache.json target/cljs/spec/gen/alpha\$macros.cache.json
 
 rm -rf lumo-cljs
diff --git a/src/cljs/snapshot/lumo/repl.cljs b/src/cljs/snapshot/lumo/repl.cljs
@@ -135,8 +135,8 @@
         cljs.source-map
         cljs.source-map.base64
         cljs.source-map.base64-vlq
-        cljs.spec
-        cljs.spec.impl.gen
+        cljs.spec.alpha
+        cljs.spec.gen.alpha
         cljs.tagged-literals
         cljs.tools.reader
         cljs.tools.reader.reader-types
@@ -1180,7 +1180,8 @@
 (def ^:private namespace-completion-additons
   (into #{} (map str)
     '[clojure.test
-      clojure.spec
+      clojure.spec.alpha
+      clojure.spec.gen.alpha
       clojure.pprint
       cljs.analyzer
       cljs.analyzer.api
@@ -1190,8 +1191,8 @@
       cljs.nodejs
       cljs.pprint
       cljs.reader
-      cljs.spec
-      cljs.spec.impl.gen
+      cljs.spec.alpha
+      cljs.spec.gen.alpha
       cljs.tagged-literals
       cljs.test
       cljs.tools.reader