community build: stop injecting sbt-dotty

griggt · griggt · commit 1092b356e6f0 · 2022-03-03T14:39:41.000-08:00
The sbt-dotty plugin was deprecated with the release of sbt 1.5.0, and removed from the dotty build in b477c42 However it was still being injected into the community build, as many projects therein had not been updated to a recent sbt, or were using a (possibly outdated) version of sbt-dotty either directly or indirectly via some other plugin. This commit discontinues that practice, since sbt 1.6.x no longer plays nice with sbt-dotty (see the linked ticket #14391). Many of the community build projects are already updated upstream to use sbt 1.5.x or 1.6.x without sbt-dotty; those are updated to their upstream versions in this PR as appropriate. A handful of community build projects are either unmaintained or do not offer Scala 3 support upstream, or their inclusion in the community build was part of some special effort. Those projects, listed below, have had their dotty-staging forks updated to use sbt 1.6.2 and drop sbt-dotty. - betterfiles - effpi - fastparse - intent - scalap
diff --git a/.gitignore b/.gitignore
@@ -65,6 +65,7 @@ compiler/after-pickling.txt
 bench/compile.txt
 
 community-build/scala3-bootstrapped.version
+community-build/sbt-injected-plugins
 community-build/sbt-dotty-sbt
 community-build/sbt-scalajs-sbt
 community-build/dotty-community-build-deps
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "community-build/community-projects/algebra"]
-	path = community-build/community-projects/algebra
-	url = https://github.com/dotty-staging/algebra
 [submodule "community-build/community-projects/betterfiles"]
 	path = community-build/community-projects/betterfiles
 	url = https://github.com/dotty-staging/better-files
diff --git a/community-build/community-projects/AsyncFile b/community-build/community-projects/AsyncFile
@@ -1 +1 @@
-Subproject commit 831f1db78cbda7b060a7dfe0426d0b59709fd728
+Subproject commit d72a5279e4b055ad13d1c19d75939b9bd9d014a0
diff --git a/community-build/community-projects/Equal b/community-build/community-projects/Equal
@@ -1 +1 @@
-Subproject commit 43e829e0195961500824388a6552a66ec13521cd
+Subproject commit 4340d3a6b503aad4fbea89ee6026923127e8b1ab
diff --git a/community-build/community-projects/FingerTree b/community-build/community-projects/FingerTree
@@ -1 +1 @@
-Subproject commit b5c89dff9efaab861b605199ac3d0ccfbb3f80d4
+Subproject commit 0ed006549a78036aac0b09375e90237e72f599fe
diff --git a/community-build/community-projects/Log b/community-build/community-projects/Log
@@ -1 +1 @@
-Subproject commit bef85c8a61d8f08be65a2de1822cb60485296d32
+Subproject commit 1839754549ed690fbba2ea1b220e3f70f8d2ba91
diff --git a/community-build/community-projects/Lucre b/community-build/community-projects/Lucre
@@ -1 +1 @@
-Subproject commit 412b1ac4b2630b7e883822cca4ce0e6452a1bbfd
+Subproject commit 0def1dcb1aa63ba8f398428c000cb2a2f166cca4
diff --git a/community-build/community-projects/Model b/community-build/community-projects/Model
@@ -1 +1 @@
-Subproject commit d4fa3fdc4049020e2cddd694d0e44f79b2bc0cfe
+Subproject commit d797f70e9d178fa6a70d6aa2d3c3324bc1c27b48
diff --git a/community-build/community-projects/Monocle b/community-build/community-projects/Monocle
@@ -1 +1 @@
-Subproject commit bc5781caf523eab7e2c0e92478cbbef568a1be43
+Subproject commit a0e70744e9b3bfb0f12e4ea292151c49c3302cd1
diff --git a/community-build/community-projects/Numbers b/community-build/community-projects/Numbers
@@ -1 +1 @@
-Subproject commit 3d9a4a028e610ee28499284ed30a53789270c56e
+Subproject commit 656dfd3f7c0a541b243e2d0f5aabbd20fc8bcea6
diff --git a/community-build/community-projects/ScalaPB b/community-build/community-projects/ScalaPB
@@ -1 +1 @@
-Subproject commit 95515e8d052a3b36f6fad168838e874420360de4
+Subproject commit 15e623e2478b13937ccb1a2770a39971418c2086
diff --git a/community-build/community-projects/Serial b/community-build/community-projects/Serial
@@ -1 +1 @@
-Subproject commit b4c3724b7fac8b4d7fbae730118c5075c6f4392d
+Subproject commit c161cc36e68c0d24a508fc9a52a44551c779c682
diff --git a/community-build/community-projects/Span b/community-build/community-projects/Span
@@ -1 +1 @@
-Subproject commit 467882fc032081db5fe840db94251c9cc89cb30a
+Subproject commit da4c4a9c335c114dbda829150d6476aec830cb84
diff --git a/community-build/community-projects/akka b/community-build/community-projects/akka
@@ -1 +1 @@
-Subproject commit be87625f490b529e646c897aebb1d271646d899a
+Subproject commit ca4fedeefe9bf98d76d34b65d0479ea8257931aa
diff --git a/community-build/community-projects/algebra b/community-build/community-projects/algebra
diff --git a/community-build/community-projects/betterfiles b/community-build/community-projects/betterfiles
@@ -1 +1 @@
-Subproject commit e138a70e49225584171e5e879181796fe5594292
+Subproject commit 0ab941360880095419183309b0b9b3363eb1ad00
diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats
@@ -1 +1 @@
-Subproject commit 878472d7bff4c3bfec8a265782c1e0d6a3147541
+Subproject commit 6bbbc1e3477b7da6b58a97844f773c3c445b4e5e
diff --git a/community-build/community-projects/cats-effect-3 b/community-build/community-projects/cats-effect-3
@@ -1 +1 @@
-Subproject commit af11317d40cee8979c4e40b60431bc0f3b9e03f0
+Subproject commit 2510979ee03d10e60011812698567885547d85d7
diff --git a/community-build/community-projects/cats-effect-3-forward-compat b/community-build/community-projects/cats-effect-3-forward-compat
@@ -1 +1 @@
-Subproject commit af11317d40cee8979c4e40b60431bc0f3b9e03f0
+Subproject commit 2510979ee03d10e60011812698567885547d85d7
diff --git a/community-build/community-projects/cats-forward-compat b/community-build/community-projects/cats-forward-compat
@@ -1 +1 @@
-Subproject commit 878472d7bff4c3bfec8a265782c1e0d6a3147541
+Subproject commit 6bbbc1e3477b7da6b58a97844f773c3c445b4e5e
diff --git a/community-build/community-projects/cats-mtl b/community-build/community-projects/cats-mtl
@@ -1 +1 @@
-Subproject commit 7679d606336a4da0e6dfca43c0a481db273cc10c
+Subproject commit 149f002c8774b61df87cb846455d94ae858b3b54
diff --git a/community-build/community-projects/cats-mtl-forward-compat b/community-build/community-projects/cats-mtl-forward-compat
@@ -1 +1 @@
-Subproject commit 7679d606336a4da0e6dfca43c0a481db273cc10c
+Subproject commit 149f002c8774b61df87cb846455d94ae858b3b54
diff --git a/community-build/community-projects/coop b/community-build/community-projects/coop
@@ -1 +1 @@
-Subproject commit 4babee9613a4bc0713d195676dd169c4f636a31a
+Subproject commit 8700dde73ef16a6135014840c4e33361dbd015d7
diff --git a/community-build/community-projects/coop-forward-compat b/community-build/community-projects/coop-forward-compat
@@ -1 +1 @@
-Subproject commit 4babee9613a4bc0713d195676dd169c4f636a31a
+Subproject commit 8700dde73ef16a6135014840c4e33361dbd015d7
diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline
@@ -1 +1 @@
-Subproject commit b0865da0c5e016ad1d45060f52885219256d3205
+Subproject commit afd00132678985341db210b56f3b2ead1a8405c2
diff --git a/community-build/community-projects/discipline-forward-compat b/community-build/community-projects/discipline-forward-compat
@@ -1 +1 @@
-Subproject commit b0865da0c5e016ad1d45060f52885219256d3205
+Subproject commit afd00132678985341db210b56f3b2ead1a8405c2
diff --git a/community-build/community-projects/discipline-munit b/community-build/community-projects/discipline-munit
@@ -1 +1 @@
-Subproject commit 014f8ca26fefab7c32a2779b9d3382df14ccf860
+Subproject commit 38ea89226b8ddedc891b160f75d57ae5177f19a1
diff --git a/community-build/community-projects/discipline-munit-forward-compat b/community-build/community-projects/discipline-munit-forward-compat
@@ -1 +1 @@
-Subproject commit 014f8ca26fefab7c32a2779b9d3382df14ccf860
+Subproject commit 38ea89226b8ddedc891b160f75d57ae5177f19a1
diff --git a/community-build/community-projects/discipline-specs2 b/community-build/community-projects/discipline-specs2
@@ -1 +1 @@
-Subproject commit 3603b08749404f83946aab48203f8bd9f9410b49
+Subproject commit e689c3e809a89a03cdbbb3a1771e33148715f6c7
diff --git a/community-build/community-projects/discipline-specs2-forward-compat b/community-build/community-projects/discipline-specs2-forward-compat
@@ -1 +1 @@
-Subproject commit 3603b08749404f83946aab48203f8bd9f9410b49
+Subproject commit e689c3e809a89a03cdbbb3a1771e33148715f6c7
diff --git a/community-build/community-projects/effpi b/community-build/community-projects/effpi
@@ -1 +1 @@
-Subproject commit 52702912ce92b801ab9fb033d30970cdf45b6961
+Subproject commit ebdae5f7e92431b13231938c2c8a343cbfef3fde
diff --git a/community-build/community-projects/fastparse b/community-build/community-projects/fastparse
@@ -1 +1 @@
-Subproject commit 9b02d7050013fd7158f37f60116f3907d4a578e2
+Subproject commit 8b93438064aecc7b94f4647af47c0fa237bf89a9
diff --git a/community-build/community-projects/fs2 b/community-build/community-projects/fs2
@@ -1 +1 @@
-Subproject commit bb69f51505d7871af318da56be5281f25fa6b5af
+Subproject commit 457c025ef506457fc8a7a8ba3abbf8b607decd4a
diff --git a/community-build/community-projects/intent b/community-build/community-projects/intent
@@ -1 +1 @@
-Subproject commit b1a62511741d84cc84fdf14c051804fe81629cdb
+Subproject commit 049555611f5e9cc597943da032b7775ef179b66c
diff --git a/community-build/community-projects/minitest b/community-build/community-projects/minitest
@@ -1 +1 @@
-Subproject commit 746b6aa1643254786549ebe2785c80693359acd1
+Subproject commit fb23874c030fea4f8d6b160fd4df45bde71ca02b
diff --git a/community-build/community-projects/munit b/community-build/community-projects/munit
@@ -1 +1 @@
-Subproject commit 662953cdb57fec0d8e1baa7fcd1ab178a0bba8c6
+Subproject commit 92f3ad9e8261b4c142a551baaf61ef5fed84d36a
diff --git a/community-build/community-projects/munit-cats-effect b/community-build/community-projects/munit-cats-effect
@@ -1 +1 @@
-Subproject commit 5a4ee90a625e01c47421a17d1b093b2f27b9f2c5
+Subproject commit 248187bec8dc540e06950b7faf8d0e0be1ad31b1
diff --git a/community-build/community-projects/munit-forward-compat b/community-build/community-projects/munit-forward-compat
@@ -1 +1 @@
-Subproject commit 662953cdb57fec0d8e1baa7fcd1ab178a0bba8c6
+Subproject commit 92f3ad9e8261b4c142a551baaf61ef5fed84d36a
diff --git a/community-build/community-projects/perspective b/community-build/community-projects/perspective
@@ -1 +1 @@
-Subproject commit f0525cdc94a52e92587a464761741369f3351345
+Subproject commit 365383df6a7b0c2eeb81742f479aa56269a4b557
diff --git a/community-build/community-projects/play-json b/community-build/community-projects/play-json
@@ -1 +1 @@
-Subproject commit b82b64d014a02583e1cee77ec85eef49bfba2bd4
+Subproject commit 8a221e6465b5139f46e63dd20957e5dcb2c73019
diff --git a/community-build/community-projects/protoquill b/community-build/community-projects/protoquill
@@ -1 +1 @@
-Subproject commit 5f45b00486240c5dcffff563299b989e7169be30
+Subproject commit 12b3649dfe93229d1e19fd698db4ee1b8a1ffddd
diff --git a/community-build/community-projects/scala-collection-compat b/community-build/community-projects/scala-collection-compat
@@ -1 +1 @@
-Subproject commit 57669d80c4fdd09bbe633356ffa44b833b3850aa
+Subproject commit b39b4b64732d9dd5e0f065e4180f656237ac4444
diff --git a/community-build/community-projects/scala-parallel-collections b/community-build/community-projects/scala-parallel-collections
@@ -1 +1 @@
-Subproject commit 152db284cc56c59c8fa9f74454e03d04c4355b60
+Subproject commit b26e74437f0cadc3c92e9378e69197f3494b1811
diff --git a/community-build/community-projects/scala-parser-combinators b/community-build/community-projects/scala-parser-combinators
@@ -1 +1 @@
-Subproject commit da176a05c4623c4edb81b1274034ad1e85835dc4
+Subproject commit f2f0b4f89e1fc0ffb67bbc3f93567b866880a01b
diff --git a/community-build/community-projects/scala-stm b/community-build/community-projects/scala-stm
@@ -1 +1 @@
-Subproject commit 96ef6e56af08d0ec600ec80ebec68d227a8c048c
+Subproject commit 3244edf13c41f22ff8b45143186745e9eb469220
diff --git a/community-build/community-projects/scala-xml b/community-build/community-projects/scala-xml
@@ -1 +1 @@
-Subproject commit d809e1d855d75352365ae4f218049a9910de7265
+Subproject commit 302309d11c22c34e4182ddda8e15962d9f07747d
diff --git a/community-build/community-projects/scalacheck-effect b/community-build/community-projects/scalacheck-effect
@@ -1 +1 @@
-Subproject commit a275735caed75eeb49b8ba1c4ef85d72ca6b61d8
+Subproject commit 108982f4773430fd264e4f223ad280d02b4f7969
diff --git a/community-build/community-projects/scalap b/community-build/community-projects/scalap
@@ -1 +1 @@
-Subproject commit 6dc9e16358a07150ca0e89df6ed38e79854a411c
+Subproject commit 050beff061cc637c449e672f5580ce211d42b3f6
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
@@ -1 +1 @@
-Subproject commit 75f5a3be66322f69ea624bbf5f166fbd28c5ff9e
+Subproject commit 89a3f6fb503a034439fe7943d6462458875d8d40
diff --git a/community-build/community-projects/scalatestplus-junit b/community-build/community-projects/scalatestplus-junit
@@ -1 +1 @@
-Subproject commit dd047825a880bb467d69833dca198a27c8e30f87
+Subproject commit ae7890b0798dde23764c4051b597387a37045074
diff --git a/community-build/community-projects/scalatestplus-scalacheck b/community-build/community-projects/scalatestplus-scalacheck
@@ -1 +1 @@
-Subproject commit c9d4faeb8e1c815bd932fd67a5d2fe138a2bbda8
+Subproject commit 6e404cbfa85486b1fa02449ee5e5d1f711f9c31b
diff --git a/community-build/community-projects/scalatestplus-testng b/community-build/community-projects/scalatestplus-testng
@@ -1 +1 @@
-Subproject commit f7a439f1b2078b748bc904c5c774ad1205561e31
+Subproject commit 2eea22a11a572796eecf64b275ec8cd6a1815907
diff --git a/community-build/community-projects/scalaz b/community-build/community-projects/scalaz
@@ -1 +1 @@
-Subproject commit 7d9d32a6612784713c09e9cde8507d34ed9d8f25
+Subproject commit ee85b0925809f6e04808a6124ae04dd89adba0d6
diff --git a/community-build/community-projects/scodec b/community-build/community-projects/scodec
@@ -1 +1 @@
-Subproject commit d59c0440b078292dedff10b6743d6a086f468527
+Subproject commit 96a77ecaaf913f195bb4079966a2e9fb41ce214e
diff --git a/community-build/community-projects/scodec-bits b/community-build/community-projects/scodec-bits
@@ -1 +1 @@
-Subproject commit d513312fbfc9fd54d0d3cde914b37e7755f7f6f4
+Subproject commit 5081dc10310dc2010d3b968c2772d72b57eb7d1c
diff --git a/community-build/community-projects/sconfig b/community-build/community-projects/sconfig
@@ -1 +1 @@
-Subproject commit 43f7b12dce6ec53bc7fafee8a35141944f31763e
+Subproject commit 25a0e5f7e3bf9ef0351f1a851a568b84fabec506
diff --git a/community-build/community-projects/spire b/community-build/community-projects/spire
@@ -1 +1 @@
-Subproject commit c98b32c6844f501491ab3a22d6f5be50b9b80c8d
+Subproject commit 6869620975fa84dd1ef78c2711d6a4f8197060ae
diff --git a/community-build/community-projects/verify b/community-build/community-projects/verify
@@ -1 +1 @@
-Subproject commit 3af47d0e929786436cc26bee576870a330f0d0cb
+Subproject commit 073921a373e05bcfdc863769f676089ab889a002
diff --git a/community-build/community-projects/xml-interpolator b/community-build/community-projects/xml-interpolator
@@ -1 +1 @@
-Subproject commit 0e032658e3d915bac4a22360bcdeb880bd81a03d
+Subproject commit 2d9eae585122b791a4daa3176778e3e5f0a19cf0
diff --git a/community-build/community-projects/zio b/community-build/community-projects/zio
@@ -1 +1 @@
-Subproject commit c08d2b0bd87de82617ae71fc3922292bc8f7b194
+Subproject commit 25977ff09847f1e7857f799e0abaf00c82003e76
diff --git a/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala
@@ -34,7 +34,7 @@ trait CommunityBuildRunner:
   /** Build the given project with the published local compiler and sbt plugin.
    *
    *  This test reads the compiler version from community-build/dotty-bootstrapped.version
-   *  and expects community-build/sbt-dotty-sbt to set the compiler plugin.
+   *  and expects community-build/sbt-injected-plugins to set any necessary plugins.
    *
    *  @param project    The project name, should be a git submodule in community-build/
    *  @param command    The binary file of the program used to test the project – usually
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -13,7 +13,7 @@ lazy val testedCompilerVersion: String =
 lazy val sbtPluginFilePath: String =
   // Workaround for https://github.com/sbt/sbt/issues/4395
   new File(sys.props("user.home") + "/.sbt/1.0/plugins").mkdirs()
-  communitybuildDir.resolve("sbt-dotty-sbt").toAbsolutePath().toString()
+  communitybuildDir.resolve("sbt-injected-plugins").toAbsolutePath().toString()
 
 def log(msg: String) = println(Console.GREEN + msg + Console.RESET)
 
@@ -281,12 +281,6 @@ object projects:
     requiresExperimental = true,
   )
 
-  lazy val algebra = SbtCommunityProject(
-    project       = "algebra",
-    sbtTestCommand   = "coreJVM/compile",
-    sbtDocCommand = forceDoc("coreJVM")
-  )
-
   lazy val scalacheck = SbtCommunityProject(
     project       = "scalacheck",
     sbtTestCommand   = "jvm/test;js/test",
@@ -364,7 +358,7 @@ object projects:
 
   lazy val scalaPB = SbtCommunityProject(
     project       = "ScalaPB",
-    sbtTestCommand   = "dotty-community-build/compile",
+    sbtTestCommand   = "lensesJVM3/compile; runtimeJVM3/compile; grpcRuntimeJVM3/compile; compilerPluginJVM3/compile",
     // aggregateDoc("runtimeJVM")("scalapbc", "grpcRuntime", "compilerPlugin") fails with
     // module class ScalaPbCodeGenerator$ has non-class parent: TypeRef(TermRef(ThisType(TypeRef(NoPrefix,module class <root>)),module protocbridge),ProtocCodeGenerator)
     // Also it seems that we do not handle correctly aggreagation projects
@@ -442,6 +436,7 @@ object projects:
     project = "zio",
     sbtTestCommand = "testJVMDotty",
     sbtDocCommand = forceDoc("coreJVM"),
+    scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"),
     dependencies = () => List(izumiReflect)
   )
 
@@ -468,12 +463,13 @@ object projects:
     sbtTestCommand   = "unitTests/test",
     // Adds <empty> package
     sbtDocCommand   = "coreJVM/doc",
+    scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"),
     dependencies = () => List(munit, scodecBits),
   )
 
   lazy val scalaParserCombinators = SbtCommunityProject(
     project          = "scala-parser-combinators",
-    sbtTestCommand   = "parserCombinatorsJVM/test",
+    sbtTestCommand   = "set every versionPolicyIntention := Compatibility.None; parserCombinatorsJVM/test",
     sbtDocCommand   = forceDoc("parserCombinatorsJVM"),
   )
 
@@ -512,7 +508,7 @@ object projects:
 
   lazy val catsEffect3 = SbtCommunityProject(
     project        = "cats-effect-3",
-    sbtTestCommand = "test",
+    sbtTestCommand = "ciJVM",
     sbtPublishCommand = "publishLocal",
     sbtDocCommand  = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc",
     dependencies   = () => List(cats, coop, disciplineSpecs2, scalacheck)
@@ -552,6 +548,7 @@ object projects:
     project = "discipline",
     sbtTestCommand = "coreJVM/test;coreJS/test",
     sbtPublishCommand = "set every credentials := Nil;coreJVM/publishLocal;coreJS/publishLocal",
+    scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"),
     dependencies = () => List(scalacheck)
   )
 
@@ -679,9 +676,9 @@ object projects:
 
   lazy val scissLucre = SbtCommunityProject(
     project           = "Lucre",
-    sbtTestCommand    = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;expr0JVM/test;expr1JVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test",
+    sbtTestCommand    = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test",
     extraSbtArgs      = List("-Dde.sciss.lucre.ShortTests=true"),
-    sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;expr0JVM/publishLocal;expr1JVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal",
+    sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal",
     dependencies      = () => List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest),
   )
 
@@ -711,6 +708,7 @@ object projects:
       """set actorTests/Compile/scalacOptions -= "-Xfatal-warnings"""",
       "akka-actor-tests/Test/compile",
     ).mkString("; "),
+    scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"),
     dependencies = () => List(scalatest, scalatestplusJunit, scalatestplusScalacheck)
   )
 
@@ -761,6 +759,7 @@ object projects:
     project = "fs2",
     sbtTestCommand = "coreJVM/test; coreJS/test",  // io/test requires JDK9+
     sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal",
+    scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"),
     dependencies = () => List(cats, catsEffect3, munitCatsEffect, scalacheckEffect, scodecBits)
   )
 
@@ -789,6 +788,7 @@ object projects:
     project = "spire",
     sbtTestCommand = "test",
     sbtPublishCommand = "publishLocal",
+    scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"),
     dependencies = () => List(cats, disciplineMunit)
   )
 
@@ -824,7 +824,6 @@ def allProjects = List(
   projects.cask,
   projects.scas,
   projects.intent,
-  projects.algebra,
   projects.scalacheck,
   projects.scalacheckForwardCompat,
   projects.scalatest,
diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
@@ -43,20 +43,20 @@ class CommunityBuildTestB:
   @Test def disciplineMunit = projects.disciplineMunit.run()
   @Test def disciplineSpecs2 = projects.disciplineSpecs2.run()
   @Test def fs2 = projects.fs2.run()
+  @Test def monocle = projects.monocle.run()
   @Test def munit = projects.munit.run()
   @Test def munitCatsEffect = projects.munitCatsEffect.run()
   @Test def perspective = projects.perspective.run()
   @Test def scalacheckEffect = projects.scalacheckEffect.run()
   @Test def scodec = projects.scodec.run()
   @Test def scodecBits = projects.scodecBits.run()
-  @Test def monocle = projects.monocle.run()
   @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run()
+  @Test def spire = projects.spire.run()
 end CommunityBuildTestB
 
 @Category(Array(classOf[TestCategory]))
 class CommunityBuildTestC:
   @Test def akka = projects.akka.run()
-  @Test def algebra = projects.algebra.run()
   @Test def betterfiles = projects.betterfiles.run()
   @Test def cask = projects.cask.run()
   // Temporarily disabled until problem discovered in comments to #9449 is fixed
@@ -90,7 +90,6 @@ 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 specs2 = projects.specs2.run()
   @Test def stdLib213 = projects.stdLib213.run()
diff --git a/project/Build.scala b/project/Build.scala
@@ -1462,7 +1462,7 @@ object Build {
       ).evaluated
    )
 
-  val prepareCommunityBuild = taskKey[Unit]("Publish local the compiler and the sbt plugin. Also store the versions of the published local artefacts in two files, community-build/{scala3-bootstrapped.version,sbt-dotty-sbt}.")
+  val prepareCommunityBuild = taskKey[Unit]("Publish local the compiler and the sbt plugin. Also store the versions of the published local artefacts in two files, community-build/{scala3-bootstrapped.version,sbt-injected-plugins}.")
 
   lazy val `community-build` = project.in(file("community-build")).
     dependsOn(dottyLibrary(Bootstrapped)).
@@ -1482,10 +1482,9 @@ object Build {
         // (publishLocal in `scala3-staging`).value
         val pluginText =
           s"""updateOptions in Global ~= (_.withLatestSnapshots(false))
-             |addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "$sbtDottyVersion")
              |addSbtPlugin("ch.epfl.lamp" % "sbt-community-build" % "$sbtCommunityBuildVersion")
              |addSbtPlugin("org.scala-js" % "sbt-scalajs" % "$scalaJSVersion")""".stripMargin
-        IO.write(baseDirectory.value / "sbt-dotty-sbt", pluginText)
+        IO.write(baseDirectory.value / "sbt-injected-plugins", pluginText)
         IO.write(baseDirectory.value / "scala3-bootstrapped.version", dottyVersion)
         IO.delete(baseDirectory.value / "dotty-community-build-deps")  // delete any stale deps file
       },
