diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 585e84929..766c05f63 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 22070f16a..e6a4590d0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,7 +12,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '21' - uses: DeLaGuardo/setup-clojure@3.1 with: @@ -69,7 +69,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '21' - uses: DeLaGuardo/setup-clojure@3.5 with: @@ -95,7 +95,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '21' - uses: DeLaGuardo/setup-clojure@3.1 with: @@ -139,7 +139,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '21' - uses: DeLaGuardo/setup-clojure@3.1 with: @@ -183,7 +183,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '21' - uses: DeLaGuardo/setup-clojure@3.1 with: @@ -222,7 +222,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '21' - uses: DeLaGuardo/setup-clojure@3.5 with: @@ -244,7 +244,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '21' - uses: DeLaGuardo/setup-clojure@3.1 with: diff --git a/deps.edn b/deps.edn index 9a8f42b00..d5ba05166 100644 --- a/deps.edn +++ b/deps.edn @@ -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"}} diff --git a/pom.xml b/pom.xml index 60c528f92..8a808cd22 100644 --- a/pom.xml +++ b/pom.xml @@ -30,12 +30,12 @@ com.google.javascript closure-compiler-unshaded - v20210202 + v20250402 org.clojure google-closure-library - 0.0-20201211-3e6c510d + 0.0-20250418-2ce9ab6d org.clojure @@ -374,8 +374,8 @@ maven-compiler-plugin 3.1 - 1.8 - 1.8 + 21 + 21 diff --git a/project.clj b/project.clj index 165a553e0..d46b9a126 100644 --- a/project.clj +++ b/project.clj @@ -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"]]}} diff --git a/script/bootstrap b/script/bootstrap index 6fc56b539..0ba5fa670 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -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" diff --git a/src/main/clojure/cljs/closure.clj b/src/main/clojure/cljs/closure.clj index 28faeb04d..b215573f6 100644 --- a/src/main/clojure/cljs/closure.clj +++ b/src/main/clojure/cljs/closure.clj @@ -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}) diff --git a/src/main/clojure/cljs/externs.clj b/src/main/clojure/cljs/externs.clj index 910643b49..c5343e1b1 100644 --- a/src/main/clojure/cljs/externs.clj +++ b/src/main/clojure/cljs/externs.clj @@ -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] @@ -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)]