From f58c713b72d180407c1c6df325119ad9e029f739 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 26 Nov 2020 17:16:23 +0100 Subject: [PATCH 1/2] Bump some Ammonite ecosystem projects to the latest upstream/master Bump requests --- community-build/community-projects/PPrint | 2 +- community-build/community-projects/fansi | 2 +- community-build/community-projects/geny | 2 +- community-build/community-projects/os-lib | 2 +- community-build/community-projects/requests-scala | 2 +- community-build/community-projects/sourcecode | 2 +- community-build/community-projects/upickle | 2 +- community-build/community-projects/utest | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/community-build/community-projects/PPrint b/community-build/community-projects/PPrint index 05aae07eb487..94f9f4a8590c 160000 --- a/community-build/community-projects/PPrint +++ b/community-build/community-projects/PPrint @@ -1 +1 @@ -Subproject commit 05aae07eb487b8f21216faf1d9557b24c560d6d5 +Subproject commit 94f9f4a8590c06f98e6c515ffdbf3a17054284ec diff --git a/community-build/community-projects/fansi b/community-build/community-projects/fansi index d4a43cf0fbd6..c30b5cd3cb6c 160000 --- a/community-build/community-projects/fansi +++ b/community-build/community-projects/fansi @@ -1 +1 @@ -Subproject commit d4a43cf0fbd6c26773a3164d3139c6f642f59da6 +Subproject commit c30b5cd3cb6ca94cc9f489b75b4920e8d0b71914 diff --git a/community-build/community-projects/geny b/community-build/community-projects/geny index 88b58dd3d62c..f1804705fecf 160000 --- a/community-build/community-projects/geny +++ b/community-build/community-projects/geny @@ -1 +1 @@ -Subproject commit 88b58dd3d62c8a759657e00dc833a036c815355f +Subproject commit f1804705fecfd41bf4f9a2cde24b7549fd3315a5 diff --git a/community-build/community-projects/os-lib b/community-build/community-projects/os-lib index dff1e85f4dd7..36af8391f783 160000 --- a/community-build/community-projects/os-lib +++ b/community-build/community-projects/os-lib @@ -1 +1 @@ -Subproject commit dff1e85f4dd7452b5b3b42c76548cb294a3b81ce +Subproject commit 36af8391f7836a69f6c4d0de7b41608e5b82a898 diff --git a/community-build/community-projects/requests-scala b/community-build/community-projects/requests-scala index f77fcd0f8540..70e8c48a3d74 160000 --- a/community-build/community-projects/requests-scala +++ b/community-build/community-projects/requests-scala @@ -1 +1 @@ -Subproject commit f77fcd0f8540db014a6d0ac3ca4bf90b06920659 +Subproject commit 70e8c48a3d74320758c0f2f876ff1e69b8061b81 diff --git a/community-build/community-projects/sourcecode b/community-build/community-projects/sourcecode index 3dafa7729510..ee2aaad5c8f0 160000 --- a/community-build/community-projects/sourcecode +++ b/community-build/community-projects/sourcecode @@ -1 +1 @@ -Subproject commit 3dafa7729510e12b70e7891096ae7b07d9414791 +Subproject commit ee2aaad5c8f0a634276040e8a537c2c407e4d777 diff --git a/community-build/community-projects/upickle b/community-build/community-projects/upickle index 46c4fa193e58..3f7fad929254 160000 --- a/community-build/community-projects/upickle +++ b/community-build/community-projects/upickle @@ -1 +1 @@ -Subproject commit 46c4fa193e58189a3b6434c75bbcac6f89212b21 +Subproject commit 3f7fad929254b35f7788c7d5795d8c4e2a1313b2 diff --git a/community-build/community-projects/utest b/community-build/community-projects/utest index ccb1a7e519df..6ec0a4852077 160000 --- a/community-build/community-projects/utest +++ b/community-build/community-projects/utest @@ -1 +1 @@ -Subproject commit ccb1a7e519dfe60f1a10e5fda3b6315037ce8a57 +Subproject commit 6ec0a485207791f81517571bb26d09370c9704c4 From ea4a33185b8c044280ef54fc474dc461c1be2506 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Fri, 27 Nov 2020 13:45:18 +0100 Subject: [PATCH 2/2] Update oslib test command in the CB --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 964909deedab..6fdc5658cfdd 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -114,7 +114,7 @@ object projects: lazy val oslib = MillCommunityProject( project = "os-lib", - baseCommand = s"os[$compilerVersion]", + baseCommand = s"os.jvm[$compilerVersion]", dependencies = List(utest, sourcecode) )