From 2c66e1478faaedeb135bbfe38ee1c97fad404878 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 26 Jan 2022 21:39:54 +0000 Subject: [PATCH 01/12] Add http4s to community build --- .gitmodules | 3 +++ community-build/community-projects/http4s | 1 + .../src/scala/dotty/communitybuild/projects.scala | 11 ++++++++++- .../dotty/communitybuild/CommunityBuildTest.scala | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) create mode 160000 community-build/community-projects/http4s diff --git a/.gitmodules b/.gitmodules index 4d3d22bd37e0..ce1b0817732b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -247,3 +247,6 @@ [submodule "community-build/community-projects/scalacheck-forward-compat"] path = community-build/community-projects/scalacheck-forward-compat url = https://github.com/dotty-staging/scalacheck +[submodule "community-build/community-projects/http4s"] + path = community-build/community-projects/http4s + url = https://github.com/http4s/http4s.git diff --git a/community-build/community-projects/http4s b/community-build/community-projects/http4s new file mode 160000 index 000000000000..fc0a18dd0a80 --- /dev/null +++ b/community-build/community-projects/http4s @@ -0,0 +1 @@ +Subproject commit fc0a18dd0a8091f0b2cdc87b58953e76efa47426 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index c2e505bc4960..9e6376e9858d 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -791,6 +791,13 @@ object projects: dependencies = () => List(cats, disciplineMunit) ) + lazy val http4s = SbtCommunityProject( + project = "http4s", + sbtTestCommand = "test", + sbtPublishCommand = "publishLocal", + dependencies = () => List(cats, catsEffect3, fs2, disciplineMunit, munitCatsEffect, scalacheckEffect) + ) + end projects lazy val forwardCompatMapping = Map[CommunityProject, CommunityProject]( @@ -892,7 +899,9 @@ def allProjects = List( projects.jacksonModuleScala, projects.specs2, projects.coop, - projects.coopForwardCompat + projects.coopForwardCompat, + projects.spire, + projects.http4s ) lazy val projectMap = allProjects.groupBy(_.project) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 5e40306aefd6..6608e800fd60 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -66,6 +66,7 @@ class CommunityBuildTestC: @Test def fansi = projects.fansi.run() @Test def fastparse = projects.fastparse.run() @Test def geny = projects.geny.run() + @Test def http4s = projects.http4s.run() @Test def intent = projects.intent.run() @Test def jacksonModuleScala = projects.jacksonModuleScala.run() @Test def libretto = projects.libretto.run() From 8ea5e4b39957822b7cf225beb9889eea8d3df5b4 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 26 Jan 2022 17:19:36 -0800 Subject: [PATCH 02/12] Remove fs2 from http4s dependencies --- 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 9e6376e9858d..f17c326c47f2 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -795,7 +795,7 @@ object projects: project = "http4s", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = () => List(cats, catsEffect3, fs2, disciplineMunit, munitCatsEffect, scalacheckEffect) + dependencies = () => List(cats, catsEffect3, disciplineMunit, munitCatsEffect, scalacheckEffect) ) end projects From 25b3b8c486f70eb8371a433f20e825a1247e655b Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 27 Jan 2022 12:07:47 -0800 Subject: [PATCH 03/12] Try disabling fatal warnings --- community-build/src/scala/dotty/communitybuild/projects.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index f17c326c47f2..ce06ef5a13a2 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -793,8 +793,8 @@ object projects: lazy val http4s = SbtCommunityProject( project = "http4s", - sbtTestCommand = "test", - sbtPublishCommand = "publishLocal", + sbtTestCommand = "set ThisBuild/tlFatalWarnings := false; test", + sbtPublishCommand = "set ThisBuild/tlFatalWarnings := false; publishLocal", dependencies = () => List(cats, catsEffect3, disciplineMunit, munitCatsEffect, scalacheckEffect) ) From 79adadc7c71c642a2aabda89a46e01a91816edb1 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 27 Jan 2022 13:35:22 -0800 Subject: [PATCH 04/12] Remove cats dependency --- 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 ce06ef5a13a2..da949d626185 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -795,7 +795,7 @@ object projects: project = "http4s", sbtTestCommand = "set ThisBuild/tlFatalWarnings := false; test", sbtPublishCommand = "set ThisBuild/tlFatalWarnings := false; publishLocal", - dependencies = () => List(cats, catsEffect3, disciplineMunit, munitCatsEffect, scalacheckEffect) + dependencies = () => List(catsEffect3, disciplineMunit, munitCatsEffect, scalacheckEffect) ) end projects From 22a4c6ee46676fbb152e4e2c4c7289d243462aea Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 27 Jan 2022 14:03:26 -0800 Subject: [PATCH 05/12] Remove all the dependencies --- 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 da949d626185..dbd61374a583 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -795,7 +795,7 @@ object projects: project = "http4s", sbtTestCommand = "set ThisBuild/tlFatalWarnings := false; test", sbtPublishCommand = "set ThisBuild/tlFatalWarnings := false; publishLocal", - dependencies = () => List(catsEffect3, disciplineMunit, munitCatsEffect, scalacheckEffect) + dependencies = () => Nil ) end projects From 42a4fa35f4a2321a8fe88c9d333e7d8edee92e6d Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 27 Jan 2022 14:32:45 -0800 Subject: [PATCH 06/12] Test only on jvm --- 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 dbd61374a583..5f5bf1f88e15 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -793,7 +793,7 @@ object projects: lazy val http4s = SbtCommunityProject( project = "http4s", - sbtTestCommand = "set ThisBuild/tlFatalWarnings := false; test", + sbtTestCommand = "set ThisBuild/tlFatalWarnings := false; rootJVM/test", sbtPublishCommand = "set ThisBuild/tlFatalWarnings := false; publishLocal", dependencies = () => Nil ) From 880ec2d70a5535fec16aee7d4f20f43644592516 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 27 Jan 2022 17:34:53 -0800 Subject: [PATCH 07/12] Switch to dotty-staging fork --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index ce1b0817732b..971eb25a9466 100644 --- a/.gitmodules +++ b/.gitmodules @@ -249,4 +249,4 @@ url = https://github.com/dotty-staging/scalacheck [submodule "community-build/community-projects/http4s"] path = community-build/community-projects/http4s - url = https://github.com/http4s/http4s.git + url = https://github.com/dotty-staging/http4s.git From 5cfccecdb735f3ae61e718dc99e2b7e93c7fcce2 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 8 Mar 2022 18:01:29 +0000 Subject: [PATCH 08/12] Move http4s to community build b --- .../src/scala/dotty/communitybuild/projects.scala | 7 ++++--- .../scala/dotty/communitybuild/CommunityBuildTest.scala | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 5f5bf1f88e15..512464d3890d 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -793,9 +793,10 @@ object projects: lazy val http4s = SbtCommunityProject( project = "http4s", - sbtTestCommand = "set ThisBuild/tlFatalWarnings := false; rootJVM/test", - sbtPublishCommand = "set ThisBuild/tlFatalWarnings := false; publishLocal", - dependencies = () => Nil + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "publishLocal", + scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), + dependencies = () => List(cats, catsEffect, fs2, disciplineMunit, scalacheckEffect) ) end projects diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 6608e800fd60..5be7f936ab66 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -52,6 +52,7 @@ class CommunityBuildTestB: @Test def scodecBits = projects.scodecBits.run() @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run() @Test def spire = projects.spire.run() + @Test def http4s = projects.http4s.run() end CommunityBuildTestB @Category(Array(classOf[TestCategory])) @@ -66,7 +67,6 @@ class CommunityBuildTestC: @Test def fansi = projects.fansi.run() @Test def fastparse = projects.fastparse.run() @Test def geny = projects.geny.run() - @Test def http4s = projects.http4s.run() @Test def intent = projects.intent.run() @Test def jacksonModuleScala = projects.jacksonModuleScala.run() @Test def libretto = projects.libretto.run() From 1a853fe14697069033fcfa4426bfd93bce8b8102 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 8 Mar 2022 11:12:59 -0800 Subject: [PATCH 09/12] Fix typo --- 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 512464d3890d..35bd2b49de13 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -796,7 +796,7 @@ object projects: sbtTestCommand = "rootJVM/test", sbtPublishCommand = "publishLocal", scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), - dependencies = () => List(cats, catsEffect, fs2, disciplineMunit, scalacheckEffect) + dependencies = () => List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect) ) end projects From 16fa4267f9135600459646d79264999d7584f257 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 8 Mar 2022 21:34:01 +0000 Subject: [PATCH 10/12] Don't run flaky tests --- 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 35bd2b49de13..0305d722e61e 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -793,7 +793,7 @@ object projects: lazy val http4s = SbtCommunityProject( project = "http4s", - sbtTestCommand = "rootJVM/test", + sbtTestCommand = "tests/test server/test client/test emberCore/test emberServer/test emberClient/test circe/test", sbtPublishCommand = "publishLocal", scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), dependencies = () => List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect) From e2e7d070c4d992979f9a9774636ae60bb0a42316 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 8 Mar 2022 15:11:21 -0800 Subject: [PATCH 11/12] Do I even know how to s-b-t --- 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 0305d722e61e..fcf447a3003b 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -793,7 +793,7 @@ object projects: lazy val http4s = SbtCommunityProject( project = "http4s", - sbtTestCommand = "tests/test server/test client/test emberCore/test emberServer/test emberClient/test circe/test", + sbtTestCommand = "tests/test; server/test; client/test; emberCore/test; emberServer/test; emberClient/test; circe/test", sbtPublishCommand = "publishLocal", scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), dependencies = () => List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect) From ff569242f794a4ab60e67629c6f239642a7f6093 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 8 Mar 2022 16:47:39 -0800 Subject: [PATCH 12/12] Sigh ... --- 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 fcf447a3003b..c5e7997d0b21 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -793,7 +793,7 @@ object projects: lazy val http4s = SbtCommunityProject( project = "http4s", - sbtTestCommand = "tests/test; server/test; client/test; emberCore/test; emberServer/test; emberClient/test; circe/test", + sbtTestCommand = "tests/test; server/test; client/test; ember-core/test; ember-server/test; ember-client/test; circe/test", sbtPublishCommand = "publishLocal", scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), dependencies = () => List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect)