From 7f32416f67c0ddfa099eb21c2af9cb7e74acfda7 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 9 Sep 2024 16:11:11 +0800 Subject: [PATCH 1/8] Update .mill-version --- .mill-version | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.mill-version b/.mill-version index 98cd234..17efad1 100644 --- a/.mill-version +++ b/.mill-version @@ -1,2 +1 @@ -0.11.11 - +0.12.0-RC1 From 3f314e7750fa8b4bbc77c453a2618fb7069d7b66 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 9 Sep 2024 16:54:22 +0800 Subject: [PATCH 2/8] . --- mill | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mill b/mill index 280389b..d03a045 100755 --- a/mill +++ b/mill @@ -7,7 +7,7 @@ set -e if [ -z "${DEFAULT_MILL_VERSION}" ] ; then - DEFAULT_MILL_VERSION=0.11.5 + DEFAULT_MILL_VERSION=0.11.12 fi if [ -z "$MILL_VERSION" ] ; then @@ -40,7 +40,7 @@ if [ ! -s "$MILL_EXEC_PATH" ] ; then fi DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/') - MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION_TAG}/$MILL_VERSION${ASSEMBLY}" + MILL_DOWNLOAD_URL="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/$MILL_VERSION/mill-dist-$MILL_VERSION.jar" curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL" chmod +x "$DOWNLOAD_FILE" mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH" @@ -53,7 +53,9 @@ if [ -z "$MILL_MAIN_CLI" ] ; then fi MILL_FIRST_ARG="" -if [ "$1" = "--bsp" ] || [ "$1" = "-i" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then + + # first arg is a long flag for "--interactive" or starts with "-i" +if [ "$1" = "--bsp" ] || [ "${1#"-i"}" != "$1" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then # Need to preserve the first position of those listed options MILL_FIRST_ARG=$1 shift From 45f30d63aa444df408f81495a07d5f38486c98d3 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 9 Sep 2024 17:31:13 +0800 Subject: [PATCH 3/8] . --- requests/test/src/requests/RequestTests.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/test/src/requests/RequestTests.scala b/requests/test/src/requests/RequestTests.scala index 28b7d07..abbe093 100644 --- a/requests/test/src/requests/RequestTests.scala +++ b/requests/test/src/requests/RequestTests.scala @@ -220,7 +220,7 @@ object RequestTests extends TestSuite{ } test("clientCertificate"){ - val base = "./requests/test/resources" + val base = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) val url = "https://client.badssl.com" val instruction = "https://github.com/lihaoyi/requests-scala/blob/master/requests/test/resources/badssl.com-client.md" val certificateExpiredMessage = s"WARNING: Certificate may have expired and needs to be updated. Please check: $instruction and/or file issue" From 2d23549a86ec1213d129edf0dce63e12065e67e0 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 9 Sep 2024 17:33:11 +0800 Subject: [PATCH 4/8] . --- requests/test/src/requests/RequestTests.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/test/src/requests/RequestTests.scala b/requests/test/src/requests/RequestTests.scala index abbe093..26808ff 100644 --- a/requests/test/src/requests/RequestTests.scala +++ b/requests/test/src/requests/RequestTests.scala @@ -220,7 +220,7 @@ object RequestTests extends TestSuite{ } test("clientCertificate"){ - val base = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER")) + val base = sys.env("MILL_TEST_RESOURCE_FOLDER") val url = "https://client.badssl.com" val instruction = "https://github.com/lihaoyi/requests-scala/blob/master/requests/test/resources/badssl.com-client.md" val certificateExpiredMessage = s"WARNING: Certificate may have expired and needs to be updated. Please check: $instruction and/or file issue" From 8ab36c73d33802c2ff554f4b8082a1c6284f454c Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 4 Oct 2024 20:23:48 +0800 Subject: [PATCH 5/8] Update .mill-version --- .mill-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mill-version b/.mill-version index 17efad1..570985f 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.12.0-RC1 +0.12.0-RC3 From fa0137a219833e65eb858bb984f0e7ad621260b8 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 22 Oct 2024 07:23:03 +0800 Subject: [PATCH 6/8] Update .mill-version --- .mill-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mill-version b/.mill-version index 570985f..53cf705 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.12.0-RC3 +0.12.0-RC3-102-b8217f From 2b396c13cd5a7665d5f0780e0ca017d5789b17ba Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 22 Oct 2024 07:48:31 +0800 Subject: [PATCH 7/8] . --- requests/test/src/requests/RequestTests.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/test/src/requests/RequestTests.scala b/requests/test/src/requests/RequestTests.scala index 26808ff..c08935d 100644 --- a/requests/test/src/requests/RequestTests.scala +++ b/requests/test/src/requests/RequestTests.scala @@ -220,7 +220,7 @@ object RequestTests extends TestSuite{ } test("clientCertificate"){ - val base = sys.env("MILL_TEST_RESOURCE_FOLDER") + val base = sys.env("MILL_TEST_RESOURCE_DIR") val url = "https://client.badssl.com" val instruction = "https://github.com/lihaoyi/requests-scala/blob/master/requests/test/resources/badssl.com-client.md" val certificateExpiredMessage = s"WARNING: Certificate may have expired and needs to be updated. Please check: $instruction and/or file issue" From 868574b4bb051be89abb18050057807f663d4343 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Thu, 24 Oct 2024 07:26:53 +0800 Subject: [PATCH 8/8] Update .mill-version --- .mill-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mill-version b/.mill-version index 53cf705..ac454c6 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.12.0-RC3-102-b8217f +0.12.0