From 92040f79d17f3b26870fbf5b7231b8f4a74440da Mon Sep 17 00:00:00 2001 From: David Nolen Date: Thu, 15 May 2025 17:03:58 -0400 Subject: [PATCH 1/3] - delete pom.xml - remove tools.reader as dep, vendorized - add latest GCL release --- deps.edn | 3 +- pom.template.xml | 9 +- pom.xml | 391 ----------------------------------------------- project.clj | 3 +- script/bootstrap | 9 +- 5 files changed, 5 insertions(+), 410 deletions(-) delete mode 100644 pom.xml diff --git a/deps.edn b/deps.edn index d5ba05166..f986c34d7 100644 --- a/deps.edn +++ b/deps.edn @@ -4,9 +4,8 @@ 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-20250418-2ce9ab6d"} + org.clojure/google-closure-library {:mvn/version "0.0-20250515-f04e4c0e"} 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"}} :aliases {:cli.test.run {:extra-paths ["src/test/cljs_cli"] diff --git a/pom.template.xml b/pom.template.xml index f4c92ecd4..d340962b9 100644 --- a/pom.template.xml +++ b/pom.template.xml @@ -30,17 +30,12 @@ com.google.javascript closure-compiler-unshaded - v20240317 + v20250402 org.clojure google-closure-library - 0.0-20230227-c7c0a541 - - - org.clojure - tools.reader - 1.3.6 + 0.0-20250515-f04e4c0e com.cognitect diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 8a808cd22..000000000 --- a/pom.xml +++ /dev/null @@ -1,391 +0,0 @@ - - 4.0.0 - org.clojure - clojurescript - - 1.10.843 - jar - ClojureScript - - https://github.com/clojure/clojurescript - - - ClojureScript compiler and core runtime library. - - - - - Eclipse Public License 1.0 - http://opensource.org/licenses/eclipse-1.0.php - repo - - - - - - org.clojure - clojure - 1.8.0 - - - com.google.javascript - closure-compiler-unshaded - v20250402 - - - org.clojure - google-closure-library - 0.0-20250418-2ce9ab6d - - - org.clojure - data.json - 0.2.6 - - - org.clojure - tools.reader - 1.3.3 - - - com.cognitect - transit-clj - 0.8.309 - - - org.clojure - clojure - - - - - org.clojure - test.check - 0.10.0-alpha3 - test - - - org.clojure - clojure - - - - - - - Aaron Bedra - Alan Dipert - Alex Dowad - Alan Malloy - Alen Ribic - Alex Redington - Ambrose Bonnaire-Sergeant - Andrew Rosa - Antonin Hildebrand - Ben Moss - Benjamin Meyer - Bo Jeanes - Bobby Calderwood - Brandon Bloom - Brenton Ashworth - Brian Jenkins - Brian Kim - Brian Taylor - Bruce Hauman - Chad Taylor - Chas Emerick - Charles Duffy - Chris Granger - Chris Pickard - Chris Houser - Chris Truter - Christopher Redinger - Colin Jones - Creighton Kirkendall - David Nolen - Daniel Compton - Daniel Skarda - Dave Sann - Devin Walters - Dylan Butman - Edward Tsech - Eric Normand - Eric Thorsen - Erik Ouchterlony - Evan Mezeske - Francis Avila - Frank Failla - Francoise De Serre - Gary Fredericks - Gary Trakhman - Herwig Hochleitner - Hubert Iwaniuk - Hugo Duncan - Immo Heikkinen - Ivan Willig - J. Pablo Fernandez - Jamie Brandon - Jeff Dik - Jess Martin - Joel Holdbrooks - Joel Martin - John Li - Jonas De Vuyst - Jonas Enlund - Jonathan Boston - Jozef Wagner - Juergen Hoetzel - Juho Teperi - Julian Eluard - Justin Tirrell - Kovas Boguta - Kevin J. Lynagh - Laszlo Toeroek - Leon Grapenthin - Luke VanderHart - Maria Geller - Martin Klepsch - Matjaz Gregoric - Max Gonzih - Max Penet - Max Veytsman - Michael Ballantyne - Michael Fogus - Michael Glaesemann - Michael Griffiths - Michael O. Church - Michał Marczyk - Michiel Borkent - Mike Fikes - Moritz Ulrich - Murphy McMahon - Nelson Morris - Nicola Mometto - Nikita Prokopov - Osbert Feng - Paul Michael Bauer - Paul deGrandis - Peter Schuck - Peter Stephens - Peter Taoussanis - Pieter van Prooijen - Raphaël Amiard - Raymond Huang - Rich Hickey - Roman Gonzalez - Roman Scherer - Rupa Shankar - Russ Olsen - Sam Umbach - Samuel Miller - Sean Grove - Sebastien Bensusan - Sean LeBron - Steven Kallstrom - Stuart Halloway - Stuart Mitchell - Stuart Sierra - Takahiro Hozumi - Thomas Heller - Thomas Scheiblauer - Tim Griesser - Timothy Pratley - Toby Crawley - Tom Hickey - Tom Jack - Tom Marble - Travis Thieman - Travis Vachon - Wilkes Joiner - Zachary Allaun - Zach Oakes - Zubair Quraishi - - - - scm:git:git://github.com/clojure/clojurescript.git - scm:git:git@github.com:clojure/clojurescript.git - https://github.com/clojure/clojurescript - - - - org.clojure - pom.contrib - 1.1.0 - - - - UTF-8 - src/main/clojure - src/main/cljs - src/main/cljs - resources - true - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.5 - - - add-clojure-source-dirs - generate-sources - - add-source - add-resource - - - - ${clojure.source.dir} - ${cljs.source.dir} - - - - ${clojure.source.dir} - - - ${cljs.source.dir} - - - ${resources.dir} - - - - - - - - com.theoryinpractise - clojure-maven-plugin - 1.7.1 - - false - - - - clojure-compile - compile - - compile - - - true - - cljs.util - cljs.env - cljs.js-deps - cljs.core - cljs.source-map.base64 - cljs.source-map.base64-vlq - cljs.source-map - cljs.analyzer - cljs.analyzer.utils - cljs.compiler - cljs.closure - cljs.tagged-literals - cljs.test - cljs.analyzer.api - cljs.build.api - cljs.compiler.api - cljs.spec.alpha - cljs.spec.test.alpha - cljs.spec.gen.alpha - cljs.repl - cljs.repl.browser - cljs.repl.node - cljs.repl.reflect - cljs.repl.server - cljs.main - cljs.cli - - - - - - - maven-jar-plugin - 2.4 - - - - cljs.main - - - - - - default-jar - package - - jar - - - - **/*.clj - **/*.cljc - **/*.cljs - **/*.js - **/*.map - **/*.edn - **/*.svg - **/*.png - - - - - - - maven-assembly-plugin - 2.4 - - - aot-jar - package - - single - - - false - - src/assembly/aot.xml - - - - - slim-jar - package - - single - - - - src/assembly/slim.xml - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 21 - 21 - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - r@{project.version} - - - - - diff --git a/project.clj b/project.clj index d46b9a126..aa89e9cc0 100644 --- a/project.clj +++ b/project.clj @@ -11,10 +11,9 @@ :dependencies [[org.clojure/clojure "1.10.0"] [org.clojure/spec.alpha "0.1.143"] [org.clojure/core.specs.alpha "0.1.24"] - [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-20250418-2ce9ab6d"] + [org.clojure/google-closure-library "0.0-20250515-f04e4c0e"] [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 0ba5fa670..f7d374ce1 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -6,8 +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-20250418-2ce9ab6d" -TREADER_RELEASE="1.3.6" +GCLOSURE_LIB_RELEASE="0.0-20250515-f04e4c0e" TEST_CHECK_RELEASE="1.1.1" # check dependencies @@ -101,12 +100,6 @@ if [ "$1" = "--closure-library-head" ] ; then mv orig-deps.js closure/library/closure-library/third_party/closure/goog/deps.js fi -echo "Fetching tools.reader $TREADER_RELEASE ..." -curl --retry 3 -O -s https://repo1.maven.org/maven2/org/clojure/tools.reader/$TREADER_RELEASE/tools.reader-$TREADER_RELEASE.jar || { echo "Download failed."; exit 1; } - -echo "Moving tools.reader.jar to lib/tools.reader.jar" -mv tools.reader-$TREADER_RELEASE.jar lib/tools.reader-$TREADER_RELEASE.jar - echo "Fetching test.check $TEST_CHECK_RELEASE ..." curl --retry 3 -O -s https://repo1.maven.org/maven2/org/clojure/test.check/$TEST_CHECK_RELEASE/test.check-$TEST_CHECK_RELEASE.jar || { echo "Download failed."; exit 1; } From fc21001453dd712e175a3fb7befae5b5f6ae9ac6 Mon Sep 17 00:00:00 2001 From: David Nolen Date: Thu, 15 May 2025 17:09:49 -0400 Subject: [PATCH 2/3] - bring back tools.reader --- deps.edn | 1 + pom.template.xml | 5 +++++ project.clj | 1 + script/bootstrap | 9 ++++++++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index f986c34d7..3703b8f0f 100644 --- a/deps.edn +++ b/deps.edn @@ -6,6 +6,7 @@ org.clojure/core.specs.alpha {:mvn/version "0.1.24"} org.clojure/google-closure-library {:mvn/version "0.0-20250515-f04e4c0e"} 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"}} :aliases {:cli.test.run {:extra-paths ["src/test/cljs_cli"] diff --git a/pom.template.xml b/pom.template.xml index d340962b9..cb0381efa 100644 --- a/pom.template.xml +++ b/pom.template.xml @@ -48,6 +48,11 @@ + + org.clojure + tools.reader + 1.3.6 + org.clojure test.check diff --git a/project.clj b/project.clj index aa89e9cc0..1aa1fb4f3 100644 --- a/project.clj +++ b/project.clj @@ -11,6 +11,7 @@ :dependencies [[org.clojure/clojure "1.10.0"] [org.clojure/spec.alpha "0.1.143"] [org.clojure/core.specs.alpha "0.1.24"] + [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-20250515-f04e4c0e"] diff --git a/script/bootstrap b/script/bootstrap index f7d374ce1..706f7e2c9 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -7,6 +7,7 @@ SPEC_ALPHA_RELEASE="0.1.143" CORE_SPECS_ALPHA_RELEASE="0.1.24" CLOSURE_RELEASE="20250402" GCLOSURE_LIB_RELEASE="0.0-20250515-f04e4c0e" +TREADER_RELEASE="1.3.6" TEST_CHECK_RELEASE="1.1.1" # check dependencies @@ -44,7 +45,7 @@ cd closure/library if [ "$1" = "--closure-library-head" ] ; then echo "Building against HEAD of Google Closure library..." - # Existing checkout? + # Existing checkout?0 if [ -d closure-library ] ; then echo "Updating Google Closure library from HEAD..." cd closure-library @@ -100,6 +101,12 @@ if [ "$1" = "--closure-library-head" ] ; then mv orig-deps.js closure/library/closure-library/third_party/closure/goog/deps.js fi +echo "Fetching tools.reader $TREADER_RELEASE ..." +curl --retry 3 -O -s https://repo1.maven.org/maven2/org/clojure/tools.reader/$TREADER_RELEASE/tools.reader-$TREADER_RELEASE.jar || { echo "Download failed."; exit 1; } + +echo "Moving tools.reader.jar to lib/tools.reader.jar" +mv tools.reader-$TREADER_RELEASE.jar lib/tools.reader-$TREADER_RELEASE.jar + echo "Fetching test.check $TEST_CHECK_RELEASE ..." curl --retry 3 -O -s https://repo1.maven.org/maven2/org/clojure/test.check/$TEST_CHECK_RELEASE/test.check-$TEST_CHECK_RELEASE.jar || { echo "Download failed."; exit 1; } From 6fedc5160d7a9be7347d01065d1dc67a793d073f Mon Sep 17 00:00:00 2001 From: David Nolen Date: Thu, 15 May 2025 17:10:28 -0400 Subject: [PATCH 3/3] - spurious char --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 706f7e2c9..6b2a6e44b 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -45,7 +45,7 @@ cd closure/library if [ "$1" = "--closure-library-head" ] ; then echo "Building against HEAD of Google Closure library..." - # Existing checkout?0 + # Existing checkout? if [ -d closure-library ] ; then echo "Updating Google Closure library from HEAD..." cd closure-library