From 3d110e433d804f5e6cede84ced57a5bacaf00423 Mon Sep 17 00:00:00 2001 From: David Nolen Date: Mon, 19 Feb 2024 19:10:29 -0500 Subject: [PATCH] Bump Closure to v20230802 (#221) * bump Closure to v20230802 * JDK 11 for CI --- .github/workflows/test.yaml | 35 +++++++++++++++++++++++++++++++ deps.edn | 2 +- pom.template.xml | 2 +- project.clj | 2 +- script/bootstrap | 2 +- src/main/clojure/cljs/closure.clj | 16 +++++++------- 6 files changed, 46 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0a26d955c..f6c1a86ea 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,6 +9,11 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - uses: DeLaGuardo/setup-clojure@3.1 with: tools-deps: '1.10.1.763' @@ -61,6 +66,11 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - uses: DeLaGuardo/setup-clojure@3.5 with: cli: '1.10.1.763' @@ -82,6 +92,11 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - uses: DeLaGuardo/setup-clojure@3.1 with: tools-deps: '1.10.1.763' @@ -121,6 +136,11 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - uses: DeLaGuardo/setup-clojure@3.1 with: tools-deps: '1.10.1.763' @@ -160,6 +180,11 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - uses: DeLaGuardo/setup-clojure@3.1 with: tools-deps: '1.10.1.763' @@ -194,6 +219,11 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - uses: DeLaGuardo/setup-clojure@3.5 with: cli: '1.10.1.763' @@ -211,6 +241,11 @@ jobs: with: fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - uses: DeLaGuardo/setup-clojure@3.1 with: tools-deps: '1.10.1.763' diff --git a/deps.edn b/deps.edn index d888580f0..72690d6ac 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 "v20220502"} + {com.google.javascript/closure-compiler-unshaded {:mvn/version "v20230802"} 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.template.xml b/pom.template.xml index d41bfba3e..823ecf116 100644 --- a/pom.template.xml +++ b/pom.template.xml @@ -30,7 +30,7 @@ com.google.javascript closure-compiler-unshaded - v20220502 + v20230802 org.clojure diff --git a/project.clj b/project.clj index 6b273d48a..c109bbeaa 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 "v20220502"]] + [com.google.javascript/closure-compiler-unshaded "v20230802"]] :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 ecc2d2631..fc3407dd3 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="20220502" +CLOSURE_RELEASE="20230802 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 ca46b4a1d..7b58ac2a2 100644 --- a/src/main/clojure/cljs/closure.clj +++ b/src/main/clojure/cljs/closure.clj @@ -352,15 +352,13 @@ ;; name is not actually used by Closure in :modules case, ;; but we need to provide _something_ for Closure to not ;; complain - (set! (.sourceMapOutputPath compiler-options) - (str (io/file (util/output-directory opts) - "cljs_modules.map"))) - (set! (.sourceMapOutputPath compiler-options) - (:source-map opts))) - (set! (.sourceMapDetailLevel compiler-options) - SourceMap$DetailLevel/ALL) - (set! (.sourceMapFormat compiler-options) - SourceMap$Format/V3)) + (.setSourceMapOutputPath compiler-options + (str (io/file (util/output-directory opts) + "cljs_modules.map"))) + (.setSourceMapOutputPath compiler-options + (:source-map opts))) + (.setSourceMapDetailLevel compiler-options SourceMap$DetailLevel/ALL) + (.setSourceMapFormat compiler-options SourceMap$Format/V3)) (do (.setOptionsForCompilationLevel level compiler-options) (set-options opts compiler-options)