Skip to content
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
35 changes: 35 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
@@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion pom.template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.javascript</groupId>
<artifactId>closure-compiler-unshaded</artifactId>
<version>v20220502</version>
<version>v20230802</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"]]}}
Expand Down
2 changes: 1 addition & 1 deletion script/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 7 additions & 9 deletions src/main/clojure/cljs/closure.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down