Use -M with clojure.main (#1048)

Fixes #1044
planck-repl · Dec 27, 2020 · b29498e · b29498e
1 parent 63f4798
commit b29498e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -10,9 +10,9 @@ steps:
   image: golang
   commands:
   - uname -a
-  - curl -O https://download.clojure.org/install/linux-install-1.9.0.315.sh
-  - chmod +x linux-install-1.9.0.315.sh
-  - ./linux-install-1.9.0.315.sh
+  - curl -O https://download.clojure.org/install/linux-install-1.10.1.763.sh
+  - chmod +x linux-install-1.10.1.763.sh
+  - ./linux-install-1.10.1.763.sh
   - apt-get update
   - apt-get -qq install -y default-jdk clang cmake xxd pkg-config unzip
   - apt-get -qq install -y libjavascriptcoregtk-4.0 libglib2.0-dev libzip-dev libcurl4-gnutls-dev libicu-dev

diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,8 @@ before_install:
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install clojure; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -O https://download.clojure.org/install/linux-install-1.9.0.315.sh; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod +x linux-install-1.9.0.315.sh; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ./linux-install-1.9.0.315.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -O https://download.clojure.org/install/linux-install-1.10.1.763.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod +x linux-install-1.10.1.763.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ./linux-install-1.10.1.763.sh; fi
 
 script: script/build -Werror && script/test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. This change
 ### Changed
 - Update to ClojureScript 1.10.758 ([#1034](https://github.com/planck-repl/planck/issues/1034))
 - Qualify lib names ([#1043](https://github.com/planck-repl/planck/issues/1043))
+- Use `-M` with `clojure.main` ([#1044](https://github.com/planck-repl/planck/issues/1044))
 
 ### Fixed
 - Drone CI builds broken ([#1038](https://github.com/planck-repl/planck/issues/1038))

diff --git a/planck-cljs/script/build b/planck-cljs/script/build
@@ -28,10 +28,10 @@ if [ -n "${CANARY_CLOJURESCRIPT_VERSION+set}" ]; then
 fi
 
 if [ -n "${RESOLVE_ALIAS+set}" ]; then
-  clojure -R"${RESOLVE_ALIAS}" -Sdeps "${DEPS:-{}}" script/build.clj
+  clojure -R"${RESOLVE_ALIAS}" -Sdeps "${DEPS:-{}}" -M script/build.clj
 else
   if [ "${VERBOSE_BUILD:-0}" == "1" ]; then
     clojure -Sdeps "${DEPS:-{}}" -Spath
   fi
-  clojure -Sdeps "${DEPS:-{}}" script/build.clj
+  clojure -Sdeps "${DEPS:-{}}" -M script/build.clj
 fi