bump tools reader and Google Closure Compiler dependencies

charset API changed in GCC, fix cljs.closure/set-options

Author: swannodette

pom.template.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.google.javascript</groupId>
             <artifactId>closure-compiler</artifactId>
-            <version>v20151216</version>
+            <version>v20160125</version>
         </dependency>
         <dependency>
             <groupId>org.clojure</groupId>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.clojure</groupId>
             <artifactId>tools.reader</artifactId>
-            <version>1.0.0-alpha1</version>
+            <version>1.0.0-alpha3</version>
         </dependency>
     </dependencies>
 

project.clj

@@ -10,9 +10,9 @@
   :test-paths ["src/test/clojure" "src/test/cljs" "src/test/self"]
   :dependencies [[org.clojure/clojure "1.7.0"]
                  [org.clojure/data.json "0.2.6"]
-                 [org.clojure/tools.reader "1.0.0-alpha1"]
+                 [org.clojure/tools.reader "1.0.0-alpha3"]
                  [org.clojure/google-closure-library "0.0-20151016-61277aea"]
-                 [com.google.javascript/closure-compiler "v20151216"]
+                 [com.google.javascript/closure-compiler "v20160125"]
                  [org.mozilla/rhino "1.7R5"]]
   :profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
              :uberjar {:aot :all :main clojure.main}}

script/bootstrap

@@ -3,11 +3,11 @@
 set -e
 
 CLOJURE_RELEASE="1.8.0"
-CLOSURE_RELEASE="20151216"
+CLOSURE_RELEASE="20160125"
 DJSON_RELEASE="0.2.6"
 GCLOSURE_LIB_RELEASE="0.0-20151016-61277aea"
 RHINO_RELEASE="1_7R5"
-TREADER_RELEASE="1.0.0-alpha1"
+TREADER_RELEASE="1.0.0-alpha3"
 
 # check dependencies
 curl -V >/dev/null  || { echo "cURL is missing, or not on your system path."; exit 1; }

src/main/clojure/cljs/closure.clj

@@ -64,6 +64,7 @@
            [javax.xml.bind DatatypeConverter]
            [java.nio.file Path Paths Files StandardWatchEventKinds WatchKey
                           WatchEvent FileVisitor FileVisitResult]
+           [java.nio.charset Charset StandardCharsets]
            [com.sun.nio.file SensitivityWatchEventModifier]
            [com.google.common.base Throwables]))
 
@@ -169,6 +170,22 @@
     :pretty-print :print-input-delimiter :pseudo-names :recompile-dependents :source-map
     :source-map-inline :source-map-timestamp :static-fns :target :verbose :warnings})
 
+(def string->charset
+  {"iso-8859-1" StandardCharsets/ISO_8859_1
+   "us-ascii"   StandardCharsets/US_ASCII
+   "utf-16"     StandardCharsets/UTF_16
+   "utf-16be"   StandardCharsets/UTF_16BE
+   "utf-16le"   StandardCharsets/UTF_16LE
+   "utf-8"      StandardCharsets/UTF_8})
+
+(defn to-charset [charset]
+  (cond
+    (instance? Charset charset) charset
+    (string? charset) (get string->charset (string/lower-case charset))
+    :else
+    (throw
+      (ex-info (str "Invalid :closure-output-charset " charset) {}))))
+
 (defn set-options
   "TODO: Add any other options that we would like to support."
   [opts ^CompilerOptions compiler-options]
@@ -221,7 +238,7 @@
       (setExtraAnnotationNames (map name (:closure-extra-annotations opts)))))
 
   (. compiler-options
-     (setOutputCharset (:closure-output-charset opts "UTF-8")))
+    (setOutputCharset (to-charset (:closure-output-charset opts "UTF-8"))))
 
   compiler-options)