diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 97c73c29e94a..88e7e4ebc9e5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -232,6 +232,10 @@ jobs: git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA" + - name: Show dependency tracking file + if: ${{ always() }} + run: cat community-build/dotty-community-build-deps || true + community_build_b: runs-on: [self-hosted, Linux] container: @@ -275,6 +279,10 @@ jobs: git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB" + - name: Show dependency tracking file + if: ${{ always() }} + run: cat community-build/dotty-community-build-deps || true + community_build_c: runs-on: [self-hosted, Linux] container: @@ -318,6 +326,10 @@ jobs: git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC" + - name: Show dependency tracking file + if: ${{ always() }} + run: cat community-build/dotty-community-build-deps || true + community_build_forward_compat: runs-on: [self-hosted, Linux] container: diff --git a/.gitignore b/.gitignore index 4df303452a3f..eb9541428302 100644 --- 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 index f93c2c9a9857..4d3d22bd37e0 100644 --- 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 index 831f1db78cbd..d72a5279e4b0 160000 --- 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 index 43e829e01959..4340d3a6b503 160000 --- 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 index b5c89dff9efa..0ed006549a78 160000 --- 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 index bef85c8a61d8..1839754549ed 160000 --- 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 index 412b1ac4b263..0def1dcb1aa6 160000 --- 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 index d4fa3fdc4049..d797f70e9d17 160000 --- 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 index bc5781caf523..a0e70744e9b3 160000 --- 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 index 3d9a4a028e61..656dfd3f7c0a 160000 --- 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 index 95515e8d052a..15e623e2478b 160000 --- 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 index b4c3724b7fac..c161cc36e68c 160000 --- 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 index 467882fc0320..da4c4a9c335c 160000 --- 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 index be87625f490b..ca4fedeefe9b 160000 --- 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 deleted file mode 160000 index a010f13d7c4f..000000000000 --- a/community-build/community-projects/algebra +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a010f13d7c4f5029ed0f6ce088f6e55a0c87ef3e diff --git a/community-build/community-projects/betterfiles b/community-build/community-projects/betterfiles index e138a70e4922..0ab941360880 160000 --- 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 index 878472d7bff4..6bbbc1e3477b 160000 --- 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 index af11317d40ce..2510979ee03d 160000 --- 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 index af11317d40ce..2510979ee03d 160000 --- 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 index 878472d7bff4..6bbbc1e3477b 160000 --- 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 index 7679d606336a..149f002c8774 160000 --- 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 index 7679d606336a..149f002c8774 160000 --- 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 index 4babee9613a4..8700dde73ef1 160000 --- 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 index 4babee9613a4..8700dde73ef1 160000 --- 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 index b0865da0c5e0..afd001326789 160000 --- 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 index b0865da0c5e0..afd001326789 160000 --- 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 index 014f8ca26fef..38ea89226b8d 160000 --- 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 index 014f8ca26fef..38ea89226b8d 160000 --- 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 index 3603b0874940..e689c3e809a8 160000 --- 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 index 3603b0874940..e689c3e809a8 160000 --- 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 index 52702912ce92..ebdae5f7e924 160000 --- 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 index 9b02d7050013..8b93438064ae 160000 --- 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 index bb69f51505d7..457c025ef506 160000 --- 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 index b1a62511741d..049555611f5e 160000 --- 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 index 746b6aa16432..fb23874c030f 160000 --- 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 index 662953cdb57f..92f3ad9e8261 160000 --- 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 index 5a4ee90a625e..248187bec8dc 160000 --- 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 index 662953cdb57f..92f3ad9e8261 160000 --- 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 index f0525cdc94a5..365383df6a7b 160000 --- 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 index b82b64d014a0..8a221e6465b5 160000 --- 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 index 5f45b0048624..12b3649dfe93 160000 --- 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 index 57669d80c4fd..b39b4b64732d 160000 --- 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 index 152db284cc56..b26e74437f0c 160000 --- 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 index da176a05c462..f2f0b4f89e1f 160000 --- 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 index 96ef6e56af08..3244edf13c41 160000 --- 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 index d809e1d855d7..302309d11c22 160000 --- 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 index a275735caed7..108982f47734 160000 --- 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 index 6dc9e16358a0..050beff061cc 160000 --- 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 index 75f5a3be6632..89a3f6fb503a 160000 --- 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 index dd047825a880..ae7890b0798d 160000 --- 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 index c9d4faeb8e1c..6e404cbfa854 160000 --- 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 index f7a439f1b207..2eea22a11a57 160000 --- 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 index 7d9d32a66127..ee85b0925809 160000 --- 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 index d59c0440b078..96a77ecaaf91 160000 --- 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 index d513312fbfc9..5081dc10310d 160000 --- 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 index 43f7b12dce6e..25a0e5f7e3bf 160000 --- 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 index c98b32c6844f..6869620975fa 160000 --- 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 index 3af47d0e9297..073921a373e0 160000 --- 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 index 0e032658e3d9..2d9eae585122 160000 --- 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 index c08d2b0bd87d..25977ff09847 160000 --- 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 index 3d52a3ff0631..d60def1a28f1 100644 --- 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 index 2497c10a525b..c2e505bc4960 100644 --- 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) @@ -145,7 +145,7 @@ final case class SbtCommunityProject( case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( - "-sbt-version", "1.6.1", + "-sbt-version", "1.6.2", "-Dsbt.supershell=false", s"-Ddotty.communitybuild.dir=$communitybuildDir", s"--addPluginSbtFile=$sbtPluginFilePath" @@ -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", @@ -305,10 +299,9 @@ object projects: // Some scalatest's tests are flaky (https://github.com/scalatest/scalatest/issues/2049) // so we disable them, this list is based on the one used in the Scala 2 community build // (https://github.com/scala/community-build/blob/2.13.x/proj/scalatest.conf). - """set scalatestTest / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "GeneratorSpec.scala" || "FrameworkSuite.scala" || "WaitersSpec.scala" || "TestSortingReporterSpec.scala" || "JavaFuturesSpec.scala" || "ParallelTestExecutionSpec.scala" || "TimeLimitsSpec.scala" || "TestThreadsStartingCounterSpec.scala" || "SuiteSortingReporterSpec.scala" || "CommonGeneratorsSpec.scala" || "PropCheckerAssertingSpec.scala" || "ConductorMethodsSuite.scala"""", - """set scalacticTest / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "NonEmptyArraySpec.scala"""", + """set scalatestTestDotty / Test / managedSources ~= (_.filterNot(_.getName == "GeneratorSpec.scala").filterNot(_.getName == "FrameworkSuite.scala").filterNot(_.getName == "WaitersSpec.scala").filterNot(_.getName == "TestSortingReporterSpec.scala").filterNot(_.getName == "JavaFuturesSpec.scala").filterNot(_.getName == "ParallelTestExecutionSpec.scala").filterNot(_.getName == "TimeLimitsSpec.scala").filterNot(_.getName == "DispatchReporterSpec.scala").filterNot(_.getName == "TestThreadsStartingCounterSpec.scala").filterNot(_.getName == "SuiteSortingReporterSpec.scala").filterNot(_.getName == "CommonGeneratorsSpec.scala").filterNot(_.getName == "PropCheckerAssertingSpec.scala").filterNot(_.getName == "ConductorMethodsSuite.scala").filterNot(_.getName == "EventuallySpec.scala"))""", + """set scalacticTestDotty / Test / managedSources ~= (_.filterNot(_.getName == "NonEmptyArraySpec.scala"))""", """set genRegularTests4 / Test / managedSources ~= (_.filterNot(_.getName == "FrameworkSuite.scala").filterNot(_.getName == "GeneratorSpec.scala").filterNot(_.getName == "CommonGeneratorsSpec.scala").filterNot(_.getName == "ParallelTestExecutionSpec.scala").filterNot(_.getName == "DispatchReporterSpec.scala").filterNot(_.getName == "TestThreadsStartingCounterSpec.scala").filterNot(_.getName == "EventuallySpec.scala"))""", - "scalacticTestDotty/test; scalatestTestDotty/test; scalacticDottyJS/compile; scalatestDottyJS/compile" ).mkString("; "), sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal; scalacticDottyJS/publishLocal; scalatestDottyJS/publishLocal", @@ -364,7 +357,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 )),module protocbridge),ProtocCodeGenerator) // Also it seems that we do not handle correctly aggreagation projects @@ -442,6 +435,7 @@ object projects: project = "zio", sbtTestCommand = "testJVMDotty", sbtDocCommand = forceDoc("coreJVM"), + scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"), dependencies = () => List(izumiReflect) ) @@ -468,12 +462,13 @@ object projects: sbtTestCommand = "unitTests/test", // Adds 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 +507,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 +547,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 +675,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 +707,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 +758,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 +787,7 @@ object projects: project = "spire", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", + scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"), dependencies = () => List(cats, disciplineMunit) ) @@ -824,7 +823,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 index f3f0bf90188e..5e40306aefd6 100644 --- 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 index 7c6f5e5953a5..b506972ebab1 100644 --- 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 }, diff --git a/project/build.properties b/project/build.properties index 3161d2146c63..c8fcab543a9c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 diff --git a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties index 3161d2146c63..c8fcab543a9c 100644 --- a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties +++ b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 diff --git a/semanticdb/project/build.properties b/semanticdb/project/build.properties index 3161d2146c63..c8fcab543a9c 100644 --- a/semanticdb/project/build.properties +++ b/semanticdb/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties index 3161d2146c63..c8fcab543a9c 100644 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties index 3161d2146c63..c8fcab543a9c 100644 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2