From 3b4827475cac69f25754b5e867fd8ba093520802 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Fri, 28 Aug 2020 16:16:33 +0200 Subject: [PATCH 1/7] Update geny, sourcecode, upickle and utest in the community build --- community-build/community-projects/geny | 2 +- community-build/community-projects/sourcecode | 2 +- community-build/community-projects/upickle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/community-build/community-projects/geny b/community-build/community-projects/geny index eabca8efc9b7..d1ef855f9f34 160000 --- a/community-build/community-projects/geny +++ b/community-build/community-projects/geny @@ -1 +1 @@ -Subproject commit eabca8efc9b76516003f686b3c20f798b5ac011e +Subproject commit d1ef855f9f34d44145c802d0a033903a3f777749 diff --git a/community-build/community-projects/sourcecode b/community-build/community-projects/sourcecode index 54f6a0a1105e..45215149cc2c 160000 --- a/community-build/community-projects/sourcecode +++ b/community-build/community-projects/sourcecode @@ -1 +1 @@ -Subproject commit 54f6a0a1105e7a063b92306cb5d70f3f489ac805 +Subproject commit 45215149cc2c895f9c156dc36f586be623453684 diff --git a/community-build/community-projects/upickle b/community-build/community-projects/upickle index 5e3be79a9245..f168d2a4c5c2 160000 --- a/community-build/community-projects/upickle +++ b/community-build/community-projects/upickle @@ -1 +1 @@ -Subproject commit 5e3be79a9245c944c569307bcfb6ad6d333c5fb8 +Subproject commit f168d2a4c5c2e7573ce5616799e5ee483f613c32 From 75966313aa4a24e918877de27a686c6bc2990cc9 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Fri, 28 Aug 2020 16:51:04 +0200 Subject: [PATCH 2/7] Add PPrint, fansi and requests-scala to the community build --- .gitmodules | 9 ++++++ community-build/community-projects/PPrint | 1 + community-build/community-projects/fansi | 1 + .../community-projects/requests-scala | 1 + .../communitybuild/CommunityBuildTest.scala | 29 ++++++++++++++++++- 5 files changed, 40 insertions(+), 1 deletion(-) create mode 160000 community-build/community-projects/PPrint create mode 160000 community-build/community-projects/fansi create mode 160000 community-build/community-projects/requests-scala diff --git a/.gitmodules b/.gitmodules index 635c564ca56b..0cde960686c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,6 +100,15 @@ [submodule "community-build/community-projects/scas"] path = community-build/community-projects/scas url = https://github.com/dotty-staging/scas.git +[submodule "community-build/community-projects/fansi"] + path = community-build/community-projects/fansi + url = https://github.com/dotty-staging/fansi.git +[submodule "community-build/community-projects/PPrint"] + path = community-build/community-projects/PPrint + url = https://github.com/dotty-staging/PPrint.git +[submodule "community-build/community-projects/requests-scala"] + path = community-build/community-projects/requests-scala + url = https://github.com/dotty-staging/requests-scala.git [submodule "community-build/community-projects/cats-effect-2"] path = community-build/community-projects/cats-effect-2 url = https://github.com/dotty-staging/cats-effect.git diff --git a/community-build/community-projects/PPrint b/community-build/community-projects/PPrint new file mode 160000 index 000000000000..5f9e4d535620 --- /dev/null +++ b/community-build/community-projects/PPrint @@ -0,0 +1 @@ +Subproject commit 5f9e4d53562043587fe0bffbc0a6df109ce9b1b6 diff --git a/community-build/community-projects/fansi b/community-build/community-projects/fansi new file mode 160000 index 000000000000..2b6c6a95102c --- /dev/null +++ b/community-build/community-projects/fansi @@ -0,0 +1 @@ +Subproject commit 2b6c6a95102c8578fd647035a2777c63b67371fe diff --git a/community-build/community-projects/requests-scala b/community-build/community-projects/requests-scala new file mode 160000 index 000000000000..8913b2ad3d41 --- /dev/null +++ b/community-build/community-projects/requests-scala @@ -0,0 +1 @@ +Subproject commit 8913b2ad3d414786eb93325d64fff28b30bd5e73 diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 09835d738133..39012d3de203 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -134,12 +134,36 @@ object projects: dependencies = List(scalatest, scalacheck, scalatestplusScalacheck, geny, utest) ) + lazy val upickleCore = MillCommunityProject( + project = "upickle", + baseCommand = s"core.jvm[$compilerVersion]", + dependencies = List(scalatest, scalacheck, scalatestplusScalacheck, geny, utest) + ) + lazy val geny = MillCommunityProject( project = "geny", baseCommand = s"geny.jvm[$compilerVersion]", dependencies = List(utest) ) + lazy val fansi = MillCommunityProject( + project = "fansi", + baseCommand = s"fansi.jvm[$compilerVersion]", + dependencies = List(utest, sourcecode) + ) + + lazy val pprint = MillCommunityProject( + project = "PPrint", + baseCommand = s"pprint.jvm[$compilerVersion]", + dependencies = List(fansi) + ) + + lazy val requests = MillCommunityProject( + project = "requests-scala", + baseCommand = s"requests[$compilerVersion]", + dependencies = List(geny, utest, ujson, upickleCore) + ) + lazy val scas = MillCommunityProject( project = "scas", baseCommand = "scas.application" @@ -403,8 +427,11 @@ class CommunityBuildTest: @Test def squants = projects.squants.run() @Test def stdLib213 = projects.stdLib213.run() @Test def ujson = projects.ujson.run() - // @Test def upickle = projects.upickle.run() + @Test def upickle = projects.upickle.run() @Test def utest = projects.utest.run() + @Test def fansi = projects.fansi.run() + @Test def pprint = projects.pprint.run() + @Test def requests = projects.requests.run() @Test def xmlInterpolator = projects.xmlInterpolator.run() @Test def zio = projects.zio.run() end CommunityBuildTest From b965c49adf080b889410f356d58b72b283228373 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Fri, 18 Sep 2020 12:15:42 +0200 Subject: [PATCH 3/7] Publish CB dependencies transitively --- .../test/scala/dotty/communitybuild/CommunityBuildTest.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 39012d3de203..914ffb26c447 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -60,6 +60,7 @@ sealed trait CommunityProject: /** Publish this project to the local Maven repository */ final def publish(): Unit = if !published then + dependencies.foreach(_.publish()) log(s"Publishing $project") if publishCommand eq null then throw RuntimeException(s"Publish command is not specified for $project. Project details:\n$this") From b7376a5bb0b3025e7cdf24e09e2aff6ad4d91988 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Fri, 18 Sep 2020 12:27:48 +0200 Subject: [PATCH 4/7] Update PPrint to the work with the latest Dotty metaprogramming API --- community-build/community-projects/PPrint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/PPrint b/community-build/community-projects/PPrint index 5f9e4d535620..df3539083ea0 160000 --- a/community-build/community-projects/PPrint +++ b/community-build/community-projects/PPrint @@ -1 +1 @@ -Subproject commit 5f9e4d53562043587fe0bffbc0a6df109ce9b1b6 +Subproject commit df3539083ea09b42886324994509f2c4737c60ab From c15a239c916899af885352622fb0ae866b02a0cb Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Tue, 22 Sep 2020 10:02:45 +0200 Subject: [PATCH 5/7] Remove Scala 2 macros from PPrint for Scala 3 --- community-build/community-projects/PPrint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/PPrint b/community-build/community-projects/PPrint index df3539083ea0..46eb82399a8d 160000 --- a/community-build/community-projects/PPrint +++ b/community-build/community-projects/PPrint @@ -1 +1 @@ -Subproject commit df3539083ea09b42886324994509f2c4737c60ab +Subproject commit 46eb82399a8df75aff26048245cfba36d09ade54 From 03bc0e2912d6139ecdc9819277b8009efd79a36f Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 23 Sep 2020 15:36:54 +0200 Subject: [PATCH 6/7] Update upickle to the latest macro API --- community-build/community-projects/upickle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/upickle b/community-build/community-projects/upickle index f168d2a4c5c2..e8f0568acb73 160000 --- a/community-build/community-projects/upickle +++ b/community-build/community-projects/upickle @@ -1 +1 @@ -Subproject commit f168d2a4c5c2e7573ce5616799e5ee483f613c32 +Subproject commit e8f0568acb7312df815b5ccc236bb22129f82ee1 From f2b9c10b71f2bfa1383c2db4086aded30ead9bcd Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 23 Sep 2020 15:55:25 +0200 Subject: [PATCH 7/7] Fix requests --- community-build/community-projects/requests-scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/requests-scala b/community-build/community-projects/requests-scala index 8913b2ad3d41..7b34ad46432a 160000 --- a/community-build/community-projects/requests-scala +++ b/community-build/community-projects/requests-scala @@ -1 +1 @@ -Subproject commit 8913b2ad3d414786eb93325d64fff28b30bd5e73 +Subproject commit 7b34ad46432a0064ceb804426771a17b217aed5e