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..46eb82399a8d --- /dev/null +++ b/community-build/community-projects/PPrint @@ -0,0 +1 @@ +Subproject commit 46eb82399a8df75aff26048245cfba36d09ade54 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/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/requests-scala b/community-build/community-projects/requests-scala new file mode 160000 index 000000000000..7b34ad46432a --- /dev/null +++ b/community-build/community-projects/requests-scala @@ -0,0 +1 @@ +Subproject commit 7b34ad46432a0064ceb804426771a17b217aed5e 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..e8f0568acb73 160000 --- a/community-build/community-projects/upickle +++ b/community-build/community-projects/upickle @@ -1 +1 @@ -Subproject commit 5e3be79a9245c944c569307bcfb6ad6d333c5fb8 +Subproject commit e8f0568acb7312df815b5ccc236bb22129f82ee1 diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 09835d738133..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") @@ -134,12 +135,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 +428,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