Skip to content

Commit 3d110e4

Browse files
authored
Bump Closure to v20230802 (#221)
* bump Closure to v20230802 * JDK 11 for CI
1 parent 270deb1 commit 3d110e4

File tree

6 files changed

+46
-13
lines changed

6 files changed

+46
-13
lines changed

Diff for: .github/workflows/test.yaml

+35
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111

12+
- uses: actions/setup-java@v4
13+
with:
14+
distribution: 'temurin'
15+
java-version: '11'
16+
1217
- uses: DeLaGuardo/setup-clojure@3.1
1318
with:
1419
tools-deps: '1.10.1.763'
@@ -61,6 +66,11 @@ jobs:
6166
steps:
6267
- uses: actions/checkout@v2
6368

69+
- uses: actions/setup-java@v4
70+
with:
71+
distribution: 'temurin'
72+
java-version: '11'
73+
6474
- uses: DeLaGuardo/setup-clojure@3.5
6575
with:
6676
cli: '1.10.1.763'
@@ -82,6 +92,11 @@ jobs:
8292
steps:
8393
- uses: actions/checkout@v2
8494

95+
- uses: actions/setup-java@v4
96+
with:
97+
distribution: 'temurin'
98+
java-version: '11'
99+
85100
- uses: DeLaGuardo/setup-clojure@3.1
86101
with:
87102
tools-deps: '1.10.1.763'
@@ -121,6 +136,11 @@ jobs:
121136
steps:
122137
- uses: actions/checkout@v2
123138

139+
- uses: actions/setup-java@v4
140+
with:
141+
distribution: 'temurin'
142+
java-version: '11'
143+
124144
- uses: DeLaGuardo/setup-clojure@3.1
125145
with:
126146
tools-deps: '1.10.1.763'
@@ -160,6 +180,11 @@ jobs:
160180
steps:
161181
- uses: actions/checkout@v2
162182

183+
- uses: actions/setup-java@v4
184+
with:
185+
distribution: 'temurin'
186+
java-version: '11'
187+
163188
- uses: DeLaGuardo/setup-clojure@3.1
164189
with:
165190
tools-deps: '1.10.1.763'
@@ -194,6 +219,11 @@ jobs:
194219
steps:
195220
- uses: actions/checkout@v2
196221

222+
- uses: actions/setup-java@v4
223+
with:
224+
distribution: 'temurin'
225+
java-version: '11'
226+
197227
- uses: DeLaGuardo/setup-clojure@3.5
198228
with:
199229
cli: '1.10.1.763'
@@ -211,6 +241,11 @@ jobs:
211241
with:
212242
fetch-depth: 0
213243

244+
- uses: actions/setup-java@v4
245+
with:
246+
distribution: 'temurin'
247+
java-version: '11'
248+
214249
- uses: DeLaGuardo/setup-clojure@3.1
215250
with:
216251
tools-deps: '1.10.1.763'

Diff for: deps.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:paths ["src/main/clojure" "src/main/cljs" "resources"]
22
:deps
3-
{com.google.javascript/closure-compiler-unshaded {:mvn/version "v20220502"}
3+
{com.google.javascript/closure-compiler-unshaded {:mvn/version "v20230802"}
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"}

Diff for: pom.template.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>com.google.javascript</groupId>
3232
<artifactId>closure-compiler-unshaded</artifactId>
33-
<version>v20220502</version>
33+
<version>v20230802</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.clojure</groupId>

Diff for: project.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[org.clojure/test.check "1.1.1" :scope "test"]
1616
[com.cognitect/transit-java "1.0.362"]
1717
[org.clojure/google-closure-library "0.0-20230227-c7c0a541"]
18-
[com.google.javascript/closure-compiler-unshaded "v20220502"]]
18+
[com.google.javascript/closure-compiler-unshaded "v20230802"]]
1919
:profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
2020
:uberjar {:aot :all :main cljs.main}
2121
:closure-snapshot {:dependencies [[com.google.javascript/closure-compiler-unshaded "1.0-SNAPSHOT"]]}}

Diff for: script/bootstrap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
CLOJURE_RELEASE="1.9.0"
66
SPEC_ALPHA_RELEASE="0.1.143"
77
CORE_SPECS_ALPHA_RELEASE="0.1.24"
8-
CLOSURE_RELEASE="20220502"
8+
CLOSURE_RELEASE="20230802
99
GCLOSURE_LIB_RELEASE="0.0-20230227-c7c0a541"
1010
TREADER_RELEASE="1.3.6"
1111
TEST_CHECK_RELEASE="1.1.1"

Diff for: src/main/clojure/cljs/closure.clj

+7-9
Original file line numberDiff line numberDiff line change
@@ -352,15 +352,13 @@
352352
;; name is not actually used by Closure in :modules case,
353353
;; but we need to provide _something_ for Closure to not
354354
;; complain
355-
(set! (.sourceMapOutputPath compiler-options)
356-
(str (io/file (util/output-directory opts)
357-
"cljs_modules.map")))
358-
(set! (.sourceMapOutputPath compiler-options)
359-
(:source-map opts)))
360-
(set! (.sourceMapDetailLevel compiler-options)
361-
SourceMap$DetailLevel/ALL)
362-
(set! (.sourceMapFormat compiler-options)
363-
SourceMap$Format/V3))
355+
(.setSourceMapOutputPath compiler-options
356+
(str (io/file (util/output-directory opts)
357+
"cljs_modules.map")))
358+
(.setSourceMapOutputPath compiler-options
359+
(:source-map opts)))
360+
(.setSourceMapDetailLevel compiler-options SourceMap$DetailLevel/ALL)
361+
(.setSourceMapFormat compiler-options SourceMap$Format/V3))
364362
(do
365363
(.setOptionsForCompilationLevel level compiler-options)
366364
(set-options opts compiler-options)

0 commit comments

Comments
 (0)