Skip to content

Commit 37724aa

Browse files
authored
Update .mill-version (#174)
1 parent 891af47 commit 37724aa

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.mill-version

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
0.11.11
2-
1+
0.12.0

mill

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
set -e
88

99
if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
10-
DEFAULT_MILL_VERSION=0.11.5
10+
DEFAULT_MILL_VERSION=0.11.12
1111
fi
1212

1313
if [ -z "$MILL_VERSION" ] ; then
@@ -40,7 +40,7 @@ if [ ! -s "$MILL_EXEC_PATH" ] ; then
4040
fi
4141
DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
4242
MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
43-
MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION_TAG}/$MILL_VERSION${ASSEMBLY}"
43+
MILL_DOWNLOAD_URL="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/$MILL_VERSION/mill-dist-$MILL_VERSION.jar"
4444
curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
4545
chmod +x "$DOWNLOAD_FILE"
4646
mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"
@@ -53,7 +53,9 @@ if [ -z "$MILL_MAIN_CLI" ] ; then
5353
fi
5454

5555
MILL_FIRST_ARG=""
56-
if [ "$1" = "--bsp" ] || [ "$1" = "-i" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then
56+
57+
# first arg is a long flag for "--interactive" or starts with "-i"
58+
if [ "$1" = "--bsp" ] || [ "${1#"-i"}" != "$1" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then
5759
# Need to preserve the first position of those listed options
5860
MILL_FIRST_ARG=$1
5961
shift

requests/test/src/requests/RequestTests.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ object RequestTests extends HttpbinTestSuite {
222222
}
223223

224224
test("clientCertificate"){
225-
val base = "./requests/test/resources"
225+
val base = sys.env("MILL_TEST_RESOURCE_DIR")
226226
val url = "https://client.badssl.com"
227227
val instruction = "https://github.com/lihaoyi/requests-scala/blob/master/requests/test/resources/badssl.com-client.md"
228228
val certificateExpiredMessage = s"WARNING: Certificate may have expired and needs to be updated. Please check: $instruction and/or file issue"

0 commit comments

Comments
 (0)