From bc0ae07d3c54e3acc9b000c8d6607dc96f5038e7 Mon Sep 17 00:00:00 2001 From: davidnolen Date: Tue, 15 Apr 2025 15:09:04 -0400 Subject: [PATCH 1/6] - bump to Closure Compiler v20250402 --- deps.edn | 2 +- pom.xml | 2 +- project.clj | 2 +- script/bootstrap | 2 +- src/main/clojure/cljs/closure.clj | 1 - src/main/clojure/cljs/externs.clj | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/deps.edn b/deps.edn index 9a8f42b00..6b4337ee6 100644 --- a/deps.edn +++ b/deps.edn @@ -1,6 +1,6 @@ {: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"} diff --git a/pom.xml b/pom.xml index 60c528f92..68062dda4 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ com.google.javascript closure-compiler-unshaded - v20210202 + v20250402 org.clojure diff --git a/project.clj b/project.clj index 165a553e0..2ae07dda0 100644 --- a/project.clj +++ b/project.clj @@ -15,7 +15,7 @@ [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"]] + [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..16431e404 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -5,7 +5,7 @@ set -e CLOJURE_RELEASE="1.9.0" SPEC_ALPHA_RELEASE="0.1.143" CORE_SPECS_ALPHA_RELEASE="0.1.24" -CLOSURE_RELEASE="20240317" +CLOSURE_RELEASE="20250402" GCLOSURE_LIB_RELEASE="0.0-20230227-c7c0a541" 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)] From 25afe21747d2124c613f45240e69ebe46035d339 Mon Sep 17 00:00:00 2001 From: davidnolen Date: Tue, 15 Apr 2025 15:14:44 -0400 Subject: [PATCH 2/6] - Java 21 --- .github/workflows/release.yml | 2 +- .github/workflows/test.yaml | 14 +++++++------- pom.xml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) 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/pom.xml b/pom.xml index 68062dda4..a06b1ffae 100644 --- a/pom.xml +++ b/pom.xml @@ -374,8 +374,8 @@ maven-compiler-plugin 3.1 - 1.8 - 1.8 + 21 + 21 From a9963128119e9d28a862c0d2d259a812921e76f5 Mon Sep 17 00:00:00 2001 From: davidnolen Date: Wed, 16 Apr 2025 07:09:58 -0400 Subject: [PATCH 3/6] exclude new warning from cljs-2650 test for now --- src/test/cljs_cli/cljs_cli/test.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/cljs_cli/cljs_cli/test.clj b/src/test/cljs_cli/cljs_cli/test.clj index e694638dd..3f5d1a9fa 100644 --- a/src/test/cljs_cli/cljs_cli/test.clj +++ b/src/test/cljs_cli/cljs_cli/test.clj @@ -87,7 +87,8 @@ (let [result (cljs-main "--compile-opts" (pr-str opts) "--compile" "foo.core")] (is (zero? (:exit result))) - (is (str/blank? (:err result)))))))) + (is (or (str/blank? (:err result)) + (re-find #"unusedPrivateMembers" (:err result))))))))) (deftest test-cljs-2673 (with-repl-env-filter #{"node"} From e0a9f431855763115d5b2302332d7f6cc3a82790 Mon Sep 17 00:00:00 2001 From: davidnolen Date: Thu, 17 Apr 2025 15:31:45 -0400 Subject: [PATCH 4/6] bump closure-library --- deps.edn | 2 +- pom.xml | 2 +- project.clj | 2 +- script/bootstrap | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.edn b/deps.edn index 6b4337ee6..24896218b 100644 --- a/deps.edn +++ b/deps.edn @@ -4,7 +4,7 @@ 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-20250417-0eb1e76c"} 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 a06b1ffae..e05a236be 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ org.clojure google-closure-library - 0.0-20201211-3e6c510d + 0.0-20250417-0eb1e76c org.clojure diff --git a/project.clj b/project.clj index 2ae07dda0..d0c8c66f3 100644 --- a/project.clj +++ b/project.clj @@ -14,7 +14,7 @@ [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"] + [org.clojure/google-closure-library "0.0-20250417-0eb1e76c"] [com.google.javascript/closure-compiler-unshaded "v20250402"]] :profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]} :uberjar {:aot :all :main cljs.main} diff --git a/script/bootstrap b/script/bootstrap index 16431e404..28e696871 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -6,7 +6,7 @@ CLOJURE_RELEASE="1.9.0" SPEC_ALPHA_RELEASE="0.1.143" CORE_SPECS_ALPHA_RELEASE="0.1.24" CLOSURE_RELEASE="20250402" -GCLOSURE_LIB_RELEASE="0.0-20230227-c7c0a541" +GCLOSURE_LIB_RELEASE="0.0-20250417-0eb1e76c" TREADER_RELEASE="1.3.6" TEST_CHECK_RELEASE="1.1.1" From e5906357be24dd39518980905b34b3bd7c49e620 Mon Sep 17 00:00:00 2001 From: davidnolen Date: Fri, 18 Apr 2025 11:53:56 -0400 Subject: [PATCH 5/6] bump closure-library again to version w/o debug loader breaking change --- deps.edn | 2 +- pom.xml | 2 +- project.clj | 2 +- script/bootstrap | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.edn b/deps.edn index 24896218b..d5ba05166 100644 --- a/deps.edn +++ b/deps.edn @@ -4,7 +4,7 @@ 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-20250417-0eb1e76c"} + 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 e05a236be..8a808cd22 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ org.clojure google-closure-library - 0.0-20250417-0eb1e76c + 0.0-20250418-2ce9ab6d org.clojure diff --git a/project.clj b/project.clj index d0c8c66f3..d46b9a126 100644 --- a/project.clj +++ b/project.clj @@ -14,7 +14,7 @@ [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-20250417-0eb1e76c"] + [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} diff --git a/script/bootstrap b/script/bootstrap index 28e696871..0ba5fa670 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -6,7 +6,7 @@ CLOJURE_RELEASE="1.9.0" SPEC_ALPHA_RELEASE="0.1.143" CORE_SPECS_ALPHA_RELEASE="0.1.24" CLOSURE_RELEASE="20250402" -GCLOSURE_LIB_RELEASE="0.0-20250417-0eb1e76c" +GCLOSURE_LIB_RELEASE="0.0-20250418-2ce9ab6d" TREADER_RELEASE="1.3.6" TEST_CHECK_RELEASE="1.1.1" From f072118080011b64eabaa017c5d1ee30a1a35437 Mon Sep 17 00:00:00 2001 From: davidnolen Date: Fri, 18 Apr 2025 12:04:02 -0400 Subject: [PATCH 6/6] revert test change --- src/test/cljs_cli/cljs_cli/test.clj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/cljs_cli/cljs_cli/test.clj b/src/test/cljs_cli/cljs_cli/test.clj index 3f5d1a9fa..e694638dd 100644 --- a/src/test/cljs_cli/cljs_cli/test.clj +++ b/src/test/cljs_cli/cljs_cli/test.clj @@ -87,8 +87,7 @@ (let [result (cljs-main "--compile-opts" (pr-str opts) "--compile" "foo.core")] (is (zero? (:exit result))) - (is (or (str/blank? (:err result)) - (re-find #"unusedPrivateMembers" (:err result))))))))) + (is (str/blank? (:err result)))))))) (deftest test-cljs-2673 (with-repl-env-filter #{"node"}