From 6310b3548b9eb7ab70c6014f6684756d2179695a Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 21 Oct 2021 13:20:12 +0000 Subject: [PATCH 1/4] Add spire to community build --- .gitmodules | 3 +++ community-build/community-projects/spire | 1 + .../src/scala/dotty/communitybuild/projects.scala | 7 +++++++ .../scala/dotty/communitybuild/CommunityBuildTest.scala | 1 + 4 files changed, 12 insertions(+) create mode 160000 community-build/community-projects/spire diff --git a/.gitmodules b/.gitmodules index 1b50ef1cc54b..44c9f7bc39e6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -213,3 +213,6 @@ [submodule "community-build/community-projects/scala-java8-compat"] path = community-build/community-projects/scala-java8-compat url = https://github.com/dotty-staging/scala-java8-compat.git +[submodule "community-build/community-projects/spire"] + path = community-build/community-projects/spire + url = https://github.com/typelevel/spire.git diff --git a/community-build/community-projects/spire b/community-build/community-projects/spire new file mode 160000 index 000000000000..c98b32c6844f --- /dev/null +++ b/community-build/community-projects/spire @@ -0,0 +1 @@ +Subproject commit c98b32c6844f501491ab3a22d6f5be50b9b80c8d diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 6d31cd73b54c..d030636461ea 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -731,6 +731,13 @@ object projects: dependencies = List(scalaJava8Compat, scalatest) ) + lazy val spire = SbtCommunityProject( + project = "spire", + sbtTestCommand = "test", + sbtPublishCommand = "publishLocal", + dependencies = List(cats, algebra, disciplineMunit) + ) + end projects def allProjects = List( diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index c1d748b4d3ad..b074130e61c8 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -90,6 +90,7 @@ class CommunityBuildTestC: @Test def scas = projects.scas.run() @Test def sconfig = projects.sconfig.run() @Test def shapeless = projects.shapeless.run() + @Test def spire = projects.spire.run() @Test def sourcecode = projects.sourcecode.run() @Test def stdLib213 = projects.stdLib213.run() @Test def ujson = projects.ujson.run() From de9728d89f1b532de67c298f1e87ee06e7d93bb2 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 21 Oct 2021 13:24:50 -0700 Subject: [PATCH 2/4] Remove algebra from spire deps --- 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 d030636461ea..19fb9f3a7475 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -735,7 +735,7 @@ object projects: project = "spire", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(cats, algebra, disciplineMunit) + dependencies = List(cats, disciplineMunit) ) end projects From b86fe0fd4760b38ef3baec02645210fffb70758f Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 1 Nov 2021 18:26:20 +0000 Subject: [PATCH 3/4] Poke ci From 8b8778b3872580ff73837bc74684c8489bf33b2e Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 17 Nov 2021 11:07:40 -0500 Subject: [PATCH 4/4] Use dotty-staging repo --- .gitmodules | 2 +- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5b3936a7aee4..e35eb824949a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -218,4 +218,4 @@ url = https://github.com/dotty-staging/specs2.git [submodule "community-build/community-projects/spire"] path = community-build/community-projects/spire - url = https://github.com/typelevel/spire.git + url = https://github.com/dotty-staging/spire.git diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 133660ffcea0..52df4be6d645 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -730,7 +730,7 @@ object projects: sbtPublishCommand = "publishLocal", dependencies = List(scalaJava8Compat, scalatest) ) - + lazy val specs2 = SbtCommunityProject( project = "specs2", sbtTestCommand = "core/testOnly -- exclude ci",