Skip to content

Commit 42718f4

Browse files
Update mill launcher (#1269)
Taking into account com-lihaoyi/mill#1729 in particular (single entrypoint).
1 parent a4cb009 commit 42718f4

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

mill

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ unset OLD_MILL
9797
unset MILL_VERSION_TAG
9898
unset MILL_REPO_URL
9999

100-
if [ "x$1" == "x-i" -o "x$1" == "x--interactive" ]; then
101-
MILL_APP_NAME="mill-interactive"
102-
else
103-
MILL_APP_NAME="mill"
104-
fi
105-
106100
mill_cs_opts=()
107101

108102
# Adapted from Mill 0.10.0-M5 assembly
@@ -120,6 +114,7 @@ init_mill_jvm_opts() {
120114
"-X"*) mill_cs_opts=("${mill_cs_opts[@]}" "--java-opt" "$line")
121115
esac
122116
done <"$mill_jvm_opts_file"
117+
mill_cs_opts=("${mill_cs_opts[@]}" "--java-opt" "-Dmill.jvm_opts_applied=true")
123118
fi
124119
}
125120

@@ -144,7 +139,7 @@ init_mill_cs_opts() {
144139

145140
# Adapted from
146141

147-
coursier_version="2.1.0-M2"
142+
coursier_version="2.1.0-M6-53-gb4f448130"
148143

149144
# https://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux/17072017#17072017
150145
if [ "$(expr substr $(uname -s) 1 5 2>/dev/null)" == "Linux" ]; then
@@ -205,4 +200,4 @@ if [ -n "${CI+set}" ]; then
205200
rm -rf "$HOME/.mill/ammonite/cache"
206201
fi
207202

208-
exec "$cs" launch "$MILL_APP_NAME:$MILL_VERSION" "${mill_cs_opts[@]}" -- "$@"
203+
exec "$cs" launch "mill:$MILL_VERSION" "${mill_cs_opts[@]}" -- "$@"

0 commit comments

Comments
 (0)