Skip to content

Commit 7f5411d

Browse files
authored
CLJS-3432: Bump to Closure Compiler v20250402 (#247)
* bump to Closure Compiler v20250402 * Java 21 now required * bump closure-library to Clojure fork w/o debug loader breaking changes
1 parent d701b45 commit 7f5411d

File tree

8 files changed

+20
-21
lines changed

8 files changed

+20
-21
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Java
2525
uses: actions/setup-java@v3
2626
with:
27-
java-version: 8
27+
java-version: 21
2828
distribution: 'temurin'
2929
cache: 'maven'
3030
server-id: sonatype-nexus-staging

.github/workflows/test.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/setup-java@v4
1313
with:
1414
distribution: 'temurin'
15-
java-version: '11'
15+
java-version: '21'
1616

1717
- uses: DeLaGuardo/[email protected]
1818
with:
@@ -69,7 +69,7 @@ jobs:
6969
- uses: actions/setup-java@v4
7070
with:
7171
distribution: 'temurin'
72-
java-version: '11'
72+
java-version: '21'
7373

7474
- uses: DeLaGuardo/[email protected]
7575
with:
@@ -95,7 +95,7 @@ jobs:
9595
- uses: actions/setup-java@v4
9696
with:
9797
distribution: 'temurin'
98-
java-version: '11'
98+
java-version: '21'
9999

100100
- uses: DeLaGuardo/[email protected]
101101
with:
@@ -139,7 +139,7 @@ jobs:
139139
- uses: actions/setup-java@v4
140140
with:
141141
distribution: 'temurin'
142-
java-version: '11'
142+
java-version: '21'
143143

144144
- uses: DeLaGuardo/[email protected]
145145
with:
@@ -183,7 +183,7 @@ jobs:
183183
- uses: actions/setup-java@v4
184184
with:
185185
distribution: 'temurin'
186-
java-version: '11'
186+
java-version: '21'
187187

188188
- uses: DeLaGuardo/[email protected]
189189
with:
@@ -222,7 +222,7 @@ jobs:
222222
- uses: actions/setup-java@v4
223223
with:
224224
distribution: 'temurin'
225-
java-version: '11'
225+
java-version: '21'
226226

227227
- uses: DeLaGuardo/[email protected]
228228
with:
@@ -244,7 +244,7 @@ jobs:
244244
- uses: actions/setup-java@v4
245245
with:
246246
distribution: 'temurin'
247-
java-version: '11'
247+
java-version: '21'
248248

249249
- uses: DeLaGuardo/[email protected]
250250
with:

deps.edn

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{:paths ["src/main/clojure" "src/main/cljs" "resources"]
22
:deps
3-
{com.google.javascript/closure-compiler-unshaded {:mvn/version "v20240317"}
3+
{com.google.javascript/closure-compiler-unshaded {:mvn/version "v20250402"}
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-20230227-c7c0a541"}
7+
org.clojure/google-closure-library {:mvn/version "0.0-20250418-2ce9ab6d"}
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.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<dependency>
3131
<groupId>com.google.javascript</groupId>
3232
<artifactId>closure-compiler-unshaded</artifactId>
33-
<version>v20210202</version>
33+
<version>v20250402</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.clojure</groupId>
3737
<artifactId>google-closure-library</artifactId>
38-
<version>0.0-20201211-3e6c510d</version>
38+
<version>0.0-20250418-2ce9ab6d</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.clojure</groupId>
@@ -374,8 +374,8 @@
374374
<artifactId>maven-compiler-plugin</artifactId>
375375
<version>3.1</version>
376376
<configuration>
377-
<source>1.8</source>
378-
<target>1.8</target>
377+
<source>21</source>
378+
<target>21</target>
379379
</configuration>
380380
</plugin>
381381
<plugin>

project.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
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-20230227-c7c0a541"]
18-
[com.google.javascript/closure-compiler-unshaded "v20240317"]]
17+
[org.clojure/google-closure-library "0.0-20250418-2ce9ab6d"]
18+
[com.google.javascript/closure-compiler-unshaded "v20250402"]]
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"]]}}

script/bootstrap

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ 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="20240317"
9-
GCLOSURE_LIB_RELEASE="0.0-20230227-c7c0a541"
8+
CLOSURE_RELEASE="20250402"
9+
GCLOSURE_LIB_RELEASE="0.0-20250418-2ce9ab6d"
1010
TREADER_RELEASE="1.3.6"
1111
TEST_CHECK_RELEASE="1.1.1"
1212

src/main/clojure/cljs/closure.clj

-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@
194194
:underscore DiagnosticGroups/UNDERSCORE
195195
:unknown-defines DiagnosticGroups/UNKNOWN_DEFINES
196196
:unused-local-variable DiagnosticGroups/UNUSED_LOCAL_VARIABLE
197-
:unused-private-property DiagnosticGroups/UNUSED_PRIVATE_PROPERTY
198197
:violated-module-dep DiagnosticGroups/VIOLATED_MODULE_DEP
199198
:visibility DiagnosticGroups/VISIBILITY})
200199

src/main/clojure/cljs/externs.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[clojure.java.io :as io]
1313
[clojure.string :as string])
1414
(:import [com.google.javascript.jscomp
15-
CompilerOptions CompilerOptions$Environment SourceFile JsAst CommandLineRunner]
15+
CompilerOptions CompilerOptions$Environment SourceFile CompilerInput CommandLineRunner]
1616
[com.google.javascript.jscomp.parsing Config$JsDocParsing]
1717
[com.google.javascript.rhino
1818
Node Token JSTypeExpression JSDocInfo$Visibility]
@@ -238,7 +238,7 @@
238238
(com.google.javascript.jscomp.Compiler/setLoggingLevel Level/WARNING)
239239
compiler)
240240
(.init (list source-file) '() compiler-options))
241-
js-ast (JsAst. source-file)
241+
js-ast (CompilerInput. source-file)
242242
^Node root (.getAstRoot js-ast closure-compiler)
243243
;; TODO: switch to getFirstChild + getNext in the loop
244244
nodes (.children root)]

0 commit comments

Comments
 (0)