Skip to content

CLJS-3432: Bump to Closure Compiler v20250402 #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v3
with:
java-version: 8
java-version: 21
distribution: 'temurin'
cache: 'maven'
server-id: sonatype-nexus-staging
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- uses: DeLaGuardo/[email protected]
with:
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- uses: DeLaGuardo/[email protected]
with:
Expand All @@ -95,7 +95,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- uses: DeLaGuardo/[email protected]
with:
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- uses: DeLaGuardo/[email protected]
with:
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- uses: DeLaGuardo/[email protected]
with:
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- uses: DeLaGuardo/[email protected]
with:
Expand All @@ -244,7 +244,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- uses: DeLaGuardo/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{:paths ["src/main/clojure" "src/main/cljs" "resources"]
:deps
{com.google.javascript/closure-compiler-unshaded {:mvn/version "v20240317"}
{com.google.javascript/closure-compiler-unshaded {:mvn/version "v20250402"}
com.cognitect/transit-java {:mvn/version "1.0.362"}
org.clojure/clojure {:mvn/version "1.10.0"}
org.clojure/core.specs.alpha {:mvn/version "0.1.24"}
org.clojure/google-closure-library {:mvn/version "0.0-20230227-c7c0a541"}
org.clojure/google-closure-library {:mvn/version "0.0-20250418-2ce9ab6d"}
org.clojure/spec.alpha {:mvn/version "0.1.143"}
org.clojure/tools.reader {:mvn/version "1.3.6"}
org.clojure/test.check {:mvn/version "1.1.1"}}
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<dependency>
<groupId>com.google.javascript</groupId>
<artifactId>closure-compiler-unshaded</artifactId>
<version>v20210202</version>
<version>v20250402</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>google-closure-library</artifactId>
<version>0.0-20201211-3e6c510d</version>
<version>0.0-20250418-2ce9ab6d</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
Expand Down Expand Up @@ -374,8 +374,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
[org.clojure/tools.reader "1.3.6"]
[org.clojure/test.check "1.1.1" :scope "test"]
[com.cognitect/transit-java "1.0.362"]
[org.clojure/google-closure-library "0.0-20230227-c7c0a541"]
[com.google.javascript/closure-compiler-unshaded "v20240317"]]
[org.clojure/google-closure-library "0.0-20250418-2ce9ab6d"]
[com.google.javascript/closure-compiler-unshaded "v20250402"]]
:profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
:uberjar {:aot :all :main cljs.main}
:closure-snapshot {:dependencies [[com.google.javascript/closure-compiler-unshaded "1.0-SNAPSHOT"]]}}
Expand Down
4 changes: 2 additions & 2 deletions script/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set -e
CLOJURE_RELEASE="1.9.0"
SPEC_ALPHA_RELEASE="0.1.143"
CORE_SPECS_ALPHA_RELEASE="0.1.24"
CLOSURE_RELEASE="20240317"
GCLOSURE_LIB_RELEASE="0.0-20230227-c7c0a541"
CLOSURE_RELEASE="20250402"
GCLOSURE_LIB_RELEASE="0.0-20250418-2ce9ab6d"
TREADER_RELEASE="1.3.6"
TEST_CHECK_RELEASE="1.1.1"

Expand Down
1 change: 0 additions & 1 deletion src/main/clojure/cljs/closure.clj
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@
:underscore DiagnosticGroups/UNDERSCORE
:unknown-defines DiagnosticGroups/UNKNOWN_DEFINES
:unused-local-variable DiagnosticGroups/UNUSED_LOCAL_VARIABLE
:unused-private-property DiagnosticGroups/UNUSED_PRIVATE_PROPERTY
:violated-module-dep DiagnosticGroups/VIOLATED_MODULE_DEP
:visibility DiagnosticGroups/VISIBILITY})

Expand Down
4 changes: 2 additions & 2 deletions src/main/clojure/cljs/externs.clj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[clojure.java.io :as io]
[clojure.string :as string])
(:import [com.google.javascript.jscomp
CompilerOptions CompilerOptions$Environment SourceFile JsAst CommandLineRunner]
CompilerOptions CompilerOptions$Environment SourceFile CompilerInput CommandLineRunner]
[com.google.javascript.jscomp.parsing Config$JsDocParsing]
[com.google.javascript.rhino
Node Token JSTypeExpression JSDocInfo$Visibility]
Expand Down Expand Up @@ -238,7 +238,7 @@
(com.google.javascript.jscomp.Compiler/setLoggingLevel Level/WARNING)
compiler)
(.init (list source-file) '() compiler-options))
js-ast (JsAst. source-file)
js-ast (CompilerInput. source-file)
^Node root (.getAstRoot js-ast closure-compiler)
;; TODO: switch to getFirstChild + getNext in the loop
nodes (.children root)]
Expand Down