Skip to content

Commit 47d43be

Browse files
authored
Bump closure lib to 2023 release (#208)
* bump closure lib * remove explicit cases of setting :language-in in various tests * set default to :ecmascript-next, AOT compile core with :es-next
1 parent 240a9a5 commit 47d43be

File tree

12 files changed

+7
-17
lines changed

12 files changed

+7
-17
lines changed

deps.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
com.cognitect/transit-java {:mvn/version "1.0.362"}
55
org.clojure/clojure {:mvn/version "1.10.0"}
66
org.clojure/core.specs.alpha {:mvn/version "0.1.24"}
7-
org.clojure/google-closure-library {:mvn/version "0.0-20211011-0726fdeb"}
7+
org.clojure/google-closure-library {:mvn/version "0.0-20230227-c7c0a541"}
88
org.clojure/spec.alpha {:mvn/version "0.1.143"}
99
org.clojure/tools.reader {:mvn/version "1.3.6"}
1010
org.clojure/test.check {:mvn/version "1.1.1"}}

pom.template.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.clojure</groupId>
3737
<artifactId>google-closure-library</artifactId>
38-
<version>0.0-20211011-0726fdeb</version>
38+
<version>0.0-20230227-c7c0a541</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.clojure</groupId>

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[org.clojure/tools.reader "1.3.6"]
1515
[org.clojure/test.check "1.1.1" :scope "test"]
1616
[com.cognitect/transit-java "1.0.362"]
17-
[org.clojure/google-closure-library "0.0-20211011-0726fdeb"]
17+
[org.clojure/google-closure-library "0.0-20230227-c7c0a541"]
1818
[com.google.javascript/closure-compiler-unshaded "v20220502"]]
1919
:profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
2020
:uberjar {:aot :all :main cljs.main}

resources/self_parity_test.edn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{:optimizations :none
22
:main self-parity.test
3-
:language-in :es6
43
:language-out :es6
54
:verbose true
65
:output-to "builds/out-self-parity/main.js"

resources/test.edn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
:npm-deps {:lodash "4.17.4"}
1010
:closure-warnings {:non-standard-jsdoc :off :global-this :off}
1111
:install-deps true
12-
:language-in :es6
1312
:language-out :es5
1413
:foreign-libs
1514
[{:file "src/test/cljs/calculator_global.js"

script/bootstrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CLOJURE_RELEASE="1.9.0"
66
SPEC_ALPHA_RELEASE="0.1.143"
77
CORE_SPECS_ALPHA_RELEASE="0.1.24"
88
CLOSURE_RELEASE="20220502"
9-
GCLOSURE_LIB_RELEASE="0.0-20211011-0726fdeb"
9+
GCLOSURE_LIB_RELEASE="0.0-20230227-c7c0a541"
1010
TREADER_RELEASE="1.3.6"
1111
TEST_CHECK_RELEASE="1.1.1"
1212

script/test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ if ! bin/cljsc src/test/cljs "{:optimizations :advanced
2222
:npm-deps {:lodash \"4.17.4\"}
2323
:closure-warnings {:non-standard-jsdoc :off :global-this :off}
2424
:install-deps true
25-
:language-in :es6
2625
:language-out :es5
2726
:foreign-libs [{:file \"src/test/cljs/calculator_global.js\"
2827
:provides [\"calculator\"]

script/test-self-parity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mkdir -p builds/out-self-parity/clojure/test
1515
mv clojure/template.clj builds/out-self-parity/clojure
1616
mv clojure/test builds/out-self-parity/clojure
1717

18-
if ! bin/cljsc src/test/self/self_parity "{:optimizations :simple :language-in :es6 :language-out :es5 :output-to \"builds/out-self-parity/main.js\" :output-dir \"builds/out-self-parity\" :main self-parity.test :target :nodejs}"; then
18+
if ! bin/cljsc src/test/self/self_parity "{:optimizations :simple :language-out :es5 :output-to \"builds/out-self-parity/main.js\" :output-dir \"builds/out-self-parity\" :main self-parity.test :target :nodejs}"; then
1919
>&2 echo ClojureScript compilation failed
2020
exit 1
2121
fi;

script/test-simple

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ if ! bin/cljsc src/test/cljs "{:optimizations :simple
2222
:npm-deps {:lodash \"4.17.4\"}
2323
:closure-warnings {:non-standard-jsdoc :off :global-this :off}
2424
:install-deps true
25-
:language-in :es6
2625
:language-out :es5
2726
:foreign-libs [{:file \"src/test/cljs/calculator_global.js\"
2827
:provides [\"calculator\"]

src/main/clojure/cljs/closure.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,7 @@
25982598
(ensure-module-opts)
25992599

26002600
(nil? (:language-in opts))
2601-
(assoc :language-in :es6)
2601+
(assoc :language-in :ecmascript-next)
26022602

26032603
(:stable-names opts)
26042604
(as-> opts
@@ -3512,7 +3512,7 @@
35123512
(ana/write-analysis-cache 'cljs.core cache src)
35133513
(ana/write-analysis-cache 'cljs.core tcache src))
35143514
(create-client-js-file
3515-
{:language-in :es6
3515+
{:language-in :ecmascript-next
35163516
:optimizations :simple
35173517
:output-dir "aot_out"}
35183518
(io/file "resources" "brepl_client.js"))

src/test/clojure/cljs/build_api_tests.clj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
["common" "app"])
127127
opts {:optimizations :simple
128128
:output-dir out
129-
:language-in :es6
130129
:modules {:common {:entries #{"hello.foo.bar"}
131130
:output-to (.getAbsolutePath common-tmp)}
132131
:app {:entries #{"hello.core"}
@@ -191,7 +190,6 @@
191190
:opts
192191
{:output-dir output-dir
193192
:optimizations :none
194-
:language-in :es6
195193
:verbose true
196194
:foreign-libs [{:file "src/test/cljs_build/loader_test/foreignA.js"
197195
:provides ["foreign.a"]}
@@ -681,7 +679,6 @@
681679
(let [out (io/file (test/tmp-dir) "cljs-2903-out")
682680
opts {:output-to (.getPath (io/file out "main.js"))
683681
:output-dir (.getPath out)
684-
:language-in :es6
685682
:fingerprint true
686683
:stable-names true
687684
:optimizations :advanced}]
@@ -715,7 +712,6 @@
715712
out-file (io/file out "main.js")
716713
{:keys [inputs opts]} {:inputs (str (io/file "src" "test" "cljs_build"))
717714
:opts {:main 'trivial.core
718-
:language-in :es6
719715
:output-dir out
720716
:output-to (.getPath out-file)
721717
:optimizations :advanced}}
@@ -730,7 +726,6 @@
730726
opts {:main 'trivial.core
731727
:output-to (.getPath out-file)
732728
:output-dir out
733-
:language-in :es6
734729
:optimizations :none}
735730
cenv (env/default-compiler-env)]
736731
(test/delete-out-files out)

src/test/clojure/cljs/test_util.clj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
:output-dir output-dir
4646
:optimizations :advanced
4747
:verbose true
48-
:language-in :es6
4948
:modules
5049
{:cljs-base
5150
{:output-to (str (io/file output-dir "module-main.js"))}

0 commit comments

Comments
 (0)