Skip to content

Commit

Permalink
CLJS-1595: Update Closure Compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
dnolen committed Apr 23, 2016
1 parent 1e794f0 commit 6ba8170
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pom.template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.javascript</groupId>
<artifactId>closure-compiler</artifactId>
<version>v20151216</version>
<version>v20160315</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[org.clojure/data.json "0.2.6"]
[org.clojure/tools.reader "1.0.0-beta1"]
[org.clojure/google-closure-library "0.0-20151016-61277aea"]
[com.google.javascript/closure-compiler "v20151216"]
[com.google.javascript/closure-compiler "v20160315"]
[org.mozilla/rhino "1.7R5"]]
:profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
:uberjar {:aot :all :main clojure.main}}
Expand Down
2 changes: 1 addition & 1 deletion script/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

CLOJURE_RELEASE="1.8.0"
CLOSURE_RELEASE="20151216"
CLOSURE_RELEASE="20160315"
DJSON_RELEASE="0.2.6"
GCLOSURE_LIB_RELEASE="0.0-20151016-61277aea"
RHINO_RELEASE="1_7R5"
Expand Down
3 changes: 1 addition & 2 deletions src/main/clojure/cljs/closure.clj
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,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"))) ;; only works > 20160125 Closure Compiler
(setOutputCharset (to-charset (:closure-output-charset opts "UTF-8"))) ;; only works > 20160125 Closure Compiler
)

compiler-options)
Expand Down

0 comments on commit 6ba8170

Please sign in to comment.