Skip to content

Commit

Permalink
community build: stop injecting sbt-dotty
Browse files Browse the repository at this point in the history
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 scala#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
  • Loading branch information
griggt committed Mar 3, 2022

Verified

This commit was signed with the committer’s verified signature. The key has expired.
addaleax Anna Henningsen
1 parent 1b0c27c commit 1092b35
Showing 64 changed files with 75 additions and 81 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion community-build/community-projects/AsyncFile
Submodule AsyncFile updated 28 files
+5 −4 README.md
+18 −17 build.sbt
+1 −1 js/src/main/scala/de/sciss/asyncfile/AsyncFile.scala
+16 −10 js/src/main/scala/de/sciss/asyncfile/IndexedDBFile.scala
+16 −13 js/src/main/scala/de/sciss/asyncfile/IndexedDBFileSystem.scala
+15 −2 js/src/main/scala/de/sciss/asyncfile/IndexedDBFileSystemProvider.scala
+1 −1 js/src/main/scala/de/sciss/asyncfile/impl/IndexedDBFileImpl.scala
+1 −1 jvm/src/main/scala/de/sciss/asyncfile/AsyncFile.scala
+2 −1 jvm/src/main/scala/de/sciss/asyncfile/DesktopFile.scala
+18 −13 jvm/src/main/scala/de/sciss/asyncfile/DesktopFileSystem.scala
+1 −1 jvm/src/main/scala/de/sciss/asyncfile/DesktopFileSystemProvider.scala
+4 −2 jvm/src/main/scala/de/sciss/asyncfile/impl/DesktopFileImpl.scala
+198 −0 jvm/src/main/scala/de/sciss/asyncfile/impl/WatcherImpl.scala
+46 −0 jvm/src/test/scala/de/sciss/asyncfile/WatchTest.scala
+1 −1 project/build.properties
+3 −4 project/plugins.sbt
+1 −1 shared/src/main/scala/de/sciss/asyncfile/AsyncChannel.scala
+1 −1 shared/src/main/scala/de/sciss/asyncfile/AsyncFileCompanion.scala
+26 −3 shared/src/main/scala/de/sciss/asyncfile/AsyncFileSystem.scala
+14 −1 shared/src/main/scala/de/sciss/asyncfile/AsyncFileSystemProvider.scala
+1 −1 shared/src/main/scala/de/sciss/asyncfile/AsyncReadableByteBuffer.scala
+1 −1 shared/src/main/scala/de/sciss/asyncfile/AsyncReadableByteChannel.scala
+1 −1 shared/src/main/scala/de/sciss/asyncfile/AsyncWritableByteChannel.scala
+1 −1 shared/src/main/scala/de/sciss/asyncfile/Exceptions.scala
+1 −1 shared/src/main/scala/de/sciss/asyncfile/FileInfo.scala
+10 −5 shared/src/main/scala/de/sciss/asyncfile/Ops.scala
+17 −0 shared/src/main/scala/de/sciss/asyncfile/Watch.scala
+4 −0 shared/src/test/scala/de/sciss/asyncfile/OpsSpec.scala
2 changes: 1 addition & 1 deletion community-build/community-projects/Equal
2 changes: 1 addition & 1 deletion community-build/community-projects/FingerTree
2 changes: 1 addition & 1 deletion community-build/community-projects/Log
2 changes: 1 addition & 1 deletion community-build/community-projects/Lucre
Submodule Lucre updated 326 files
2 changes: 1 addition & 1 deletion community-build/community-projects/Model
2 changes: 1 addition & 1 deletion community-build/community-projects/Monocle
Submodule Monocle updated 110 files
2 changes: 1 addition & 1 deletion community-build/community-projects/Numbers
2 changes: 1 addition & 1 deletion community-build/community-projects/ScalaPB
Submodule ScalaPB updated 652 files
2 changes: 1 addition & 1 deletion community-build/community-projects/Serial
2 changes: 1 addition & 1 deletion community-build/community-projects/Span
2 changes: 1 addition & 1 deletion community-build/community-projects/akka
Submodule akka updated 1306 files
1 change: 0 additions & 1 deletion community-build/community-projects/algebra
Submodule algebra deleted from a010f1
2 changes: 1 addition & 1 deletion community-build/community-projects/cats
Submodule cats updated 298 files
2 changes: 1 addition & 1 deletion community-build/community-projects/cats-effect-3
Submodule cats-effect-3 updated 339 files
2 changes: 1 addition & 1 deletion community-build/community-projects/cats-forward-compat
2 changes: 1 addition & 1 deletion community-build/community-projects/effpi
2 changes: 1 addition & 1 deletion community-build/community-projects/fastparse
2 changes: 1 addition & 1 deletion community-build/community-projects/fs2
Submodule fs2 updated 307 files
2 changes: 1 addition & 1 deletion community-build/community-projects/intent
2 changes: 1 addition & 1 deletion community-build/community-projects/munit-cats-effect
2 changes: 1 addition & 1 deletion community-build/community-projects/play-json
Submodule play-json updated 78 files
+104 −0 .github/workflows/build-test.yml
+35 −0 .github/workflows/publish.yml
+1 −1 .github/workflows/release-drafter.yml
+1 −0 .gitignore
+28 −5 .mergify.yml
+39 −8 .scalafmt.conf
+0 −90 .travis.yml
+1 −1 README.md
+4 −9 RELEASING.md
+12 −12 benchmarks/src/main/scala/play/api/libs/json/Employee.scala
+1 −1 benchmarks/src/main/scala/play/api/libs/json/HashCodeCollider.scala
+56 −0 benchmarks/src/main/scala/play/api/libs/json/JsObjectBench.scala
+4 −6 benchmarks/src/main/scala/play/api/libs/json/JsonDeserialize_01_List.scala
+3 −3 benchmarks/src/main/scala/play/api/libs/json/JsonDeserialize_02_Nullable.scala
+10 −11 benchmarks/src/main/scala/play/api/libs/json/JsonMacros_01_SerializeSimpleCaseClass.scala
+4 −6 benchmarks/src/main/scala/play/api/libs/json/JsonMacros_02_SerializeList.scala
+27 −3 benchmarks/src/main/scala/play/api/libs/json/JsonParsing_01_ParseManyFields.scala
+101 −103 build.sbt
+2 −2 play-functional/src/main/scala/play/api/libs/functional/Alternative.scala
+426 −294 play-functional/src/main/scala/play/api/libs/functional/Products.scala
+4 −4 play-functional/src/main/scala/play/api/libs/functional/syntax/package.scala
+2 −2 play-json-joda/src/main/scala/play/api/libs/json/JodaReads.scala
+17 −10 play-json/js/src/main/scala/StaticBinding.scala
+7 −5 play-json/js/src/test/scala-3/play/api/libs/json/EnumSpec.scala
+0 −2 play-json/js/src/test/scala/JsonSpec.scala
+32 −22 play-json/jvm/src/main/scala/play/api/libs/json/EnvReads.scala
+4 −4 play-json/jvm/src/main/scala/play/api/libs/json/EnvWrites.scala
+2 −2 play-json/jvm/src/main/scala/play/api/libs/json/jackson/JacksonJson.scala
+1 −1 play-json/jvm/src/test/resources/logback-test.xml
+1 −3 play-json/jvm/src/test/scala-3/play/api/libs/json/EnumSpec.scala
+80 −0 play-json/jvm/src/test/scala-3/play/api/libs/json/JsonMemoryFootprintSpec.scala
+10 −7 play-json/jvm/src/test/scala/play/api/libs/json/JsonPerformanceTest.scala
+4 −4 play-json/jvm/src/test/scala/play/api/libs/json/JsonSpec.scala
+76 −82 play-json/jvm/src/test/scala/play/api/libs/json/ReadsSpec.scala
+12 −15 play-json/jvm/src/test/scala/play/api/libs/json/WritesSpec.scala
+87 −0 play-json/shared/src/main/scala-2.13+/play/api/libs/json/ImmutableLinkedHashMap.scala
+2 −2 play-json/shared/src/main/scala-2.13+/play/api/libs/json/MapWrites.scala
+1 −1 play-json/shared/src/main/scala-2.13+/play/api/libs/json/ScalaCollectionCompat.scala
+86 −0 play-json/shared/src/main/scala-2.13-/play/api/libs/json/ImmutableLinkedHashMap.scala
+63 −71 play-json/shared/src/main/scala-2/play/api/libs/json/JsMacroImpl.scala
+1 −1 play-json/shared/src/main/scala-3/play/api/libs/json/EnumerationWrites.scala
+37 −31 play-json/shared/src/main/scala-3/play/api/libs/json/JsMacroImpl.scala
+2 −2 play-json/shared/src/main/scala-3/play/api/libs/json/JsMacros.scala
+2 −2 play-json/shared/src/main/scala/play/api/libs/json/Format.scala
+3 −3 play-json/shared/src/main/scala/play/api/libs/json/JsLookup.scala
+27 −39 play-json/shared/src/main/scala/play/api/libs/json/JsPath.scala
+13 −10 play-json/shared/src/main/scala/play/api/libs/json/JsResult.scala
+28 −24 play-json/shared/src/main/scala/play/api/libs/json/JsValue.scala
+3 −4 play-json/shared/src/main/scala/play/api/libs/json/Json.scala
+2 −2 play-json/shared/src/main/scala/play/api/libs/json/JsonConfiguration.scala
+23 −26 play-json/shared/src/main/scala/play/api/libs/json/Reads.scala
+15 −13 play-json/shared/src/main/scala/play/api/libs/json/Writes.scala
+4 −5 play-json/shared/src/test/scala-2/play/api/libs/json/JsonExtensionScala2Spec.scala
+8 −8 play-json/shared/src/test/scala-2/play/api/libs/json/MacroScala2Spec.scala
+0 −14 play-json/shared/src/test/scala-2/play/api/libs/json/ScalaTestPosition.scala
+0 −14 play-json/shared/src/test/scala-2/play/api/libs/json/illTyped.scala
+0 −12 play-json/shared/src/test/scala-3/play/api/libs/json/ScalaTestPosition.scala
+0 −14 play-json/shared/src/test/scala-3/play/api/libs/json/illTyped.scala
+0 −2 play-json/shared/src/test/scala/play/api/libs/json/FormatSharedSpec.scala
+0 −2 play-json/shared/src/test/scala/play/api/libs/json/JsObjectSpec.scala
+3 −5 play-json/shared/src/test/scala/play/api/libs/json/JsPathSpec.scala
+0 −2 play-json/shared/src/test/scala/play/api/libs/json/JsResultSpec.scala
+6 −9 play-json/shared/src/test/scala/play/api/libs/json/JsonExtensionSpec.scala
+0 −2 play-json/shared/src/test/scala/play/api/libs/json/JsonRichSpec.scala
+48 −52 play-json/shared/src/test/scala/play/api/libs/json/JsonSharedSpec.scala
+103 −114 play-json/shared/src/test/scala/play/api/libs/json/JsonTransSpec.scala
+11 −13 play-json/shared/src/test/scala/play/api/libs/json/JsonValidSharedSpec.scala
+19 −20 play-json/shared/src/test/scala/play/api/libs/json/MacroSpec.scala
+8 −11 play-json/shared/src/test/scala/play/api/libs/json/ReadsSharedSpec.scala
+0 −2 play-json/shared/src/test/scala/play/api/libs/json/TupleSpec.scala
+2 −4 play-json/shared/src/test/scala/play/api/libs/json/WritesSharedSpec.scala
+4 −10 project/Common.scala
+6 −4 project/Dependencies.scala
+2 −2 project/Omnidoc.scala
+6 −6 project/Playdoc.scala
+0 −22 project/Publish.scala
+1 −1 project/build.properties
+7 −11 project/plugins.sbt
2 changes: 1 addition & 1 deletion community-build/community-projects/scala-collection-compat
Submodule scala-collection-compat updated 32 files
+69 −0 .github/workflows/ci.yml
+21 −0 .github/workflows/release.yml
+1 −1 .gitignore
+0 −0 .jvmopts
+0 −54 .travis.yml
+1 −1 CONTRIBUTING.md
+2 −2 NOTICE
+10 −12 README.md
+0 −20 admin/checkCLA.sh
+134 −130 build.sbt
+4 −4 compat/src/main/scala-2.11/scala/annotation/nowarn.scala
+34 −19 compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
+134 −13 compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
+37 −20 compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
+12 −0 compat/src/main/scala-2.11_2.12/scala/jdk/CollectionConverters.scala
+1 −0 compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala
+12 −0 compat/src/main/scala-2.13/scala/util/control/compat/package.scala
+141 −0 compat/src/test/scala-2.11_2.12/test/scala/collection/ToConserveTest.scala
+12 −0 compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala
+12 −0 compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala
+12 −0 compat/src/test/scala/scala/util/ChainingOpsTest.scala
+12 −0 compat/src/test/scala/scala/util/UsingTest.scala
+12 −0 compat/src/test/scala/scala/util/control/compat/ControlThrowableTest.scala
+4 −2 compat/src/test/scala/test/scala/collection/BuildFromTest.scala
+12 −1 compat/src/test/scala/test/scala/collection/LazyListLazinessTest.scala
+12 −0 compat/src/test/scala/test/scala/collection/LazyListTest.scala
+12 −0 compat/src/test/scala/test/scala/collection/LazyZipTest.scala
+41 −0 compat/src/test/scala/test/scala/collection/MapTest.scala
+16 −20 project/MultiScalaProject.scala
+1 −1 project/build.properties
+6 −13 project/plugins.sbt
+2 −1 scalafix/tests/src/test/scala/fix/ScalafixTests.scala
Submodule scala-parser-combinators updated 40 files
+25 −0 .github/workflows/ci.yml
+21 −0 .github/workflows/release.yml
+9 −1 .gitignore
+2 −0 .mailmap
+0 −36 .travis.yml
+2 −2 NOTICE
+6 −14 README.md
+30 −15 build.sbt
+0 −56 build.sh
+1 −1 docs/Getting_Started.md
+1 −1 project/build.properties
+5 −13 project/plugins.sbt
+0 −3 shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala
+2 −2 shared/src/main/scala/scala/util/parsing/combinator/PackratParsers.scala
+5 −13 shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala
+2 −2 shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala
+11 −8 shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala
+66 −1 shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/gh242.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/gh29.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/gh45.scala
+17 −5 shared/src/test/scala/scala/util/parsing/combinator/gh56.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/gh72.scala
+153 −0 shared/src/test/scala/scala/util/parsing/combinator/lexical/StdLexicalTest.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t0700.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t1100.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t1229.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t3212.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t4138.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t5514.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t5669.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t6067.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t6464.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t7483.scala
+12 −0 shared/src/test/scala/scala/util/parsing/combinator/t8879.scala
+12 −0 shared/src/test/scala/scala/util/parsing/input/OffsetPositionTest.scala
+12 −0 shared/src/test/scala/scala/util/parsing/input/gh178.scala
+12 −0 shared/src/test/scala/scala/util/parsing/input/gh64.scala
2 changes: 1 addition & 1 deletion community-build/community-projects/scala-xml
Submodule scala-xml updated 115 files
2 changes: 1 addition & 1 deletion community-build/community-projects/scalatest
Submodule scalatest updated 244 files
2 changes: 1 addition & 1 deletion community-build/community-projects/scalaz
Submodule scalaz updated 119 files
2 changes: 1 addition & 1 deletion community-build/community-projects/scodec
Submodule scodec updated 85 files
+63 −25 .github/workflows/ci.yml
+1 −1 .github/workflows/clean.yml
+5 −1 .scalafmt.conf
+15 −7 README.md
+33 −58 build.sbt
+59 −0 jvm/src/main/scala/scodec/codecs/PlatformCodecs.scala
+2 −4 jvm/src/main/scala/scodec/codecs/ZlibCodec.scala
+1 −1 project/build.properties
+3 −7 project/plugins.sbt
+3 −6 shared/src/main/scala/scodec/Attempt.scala
+138 −139 shared/src/main/scala/scodec/Codec.scala
+1 −2 shared/src/main/scala/scodec/DecodeResult.scala
+27 −48 shared/src/main/scala/scodec/Decoder.scala
+5 −4 shared/src/main/scala/scodec/DropUnits.scala
+26 −38 shared/src/main/scala/scodec/Encoder.scala
+2 −4 shared/src/main/scala/scodec/Err.scala
+35 −5 shared/src/main/scala/scodec/Iso.scala
+6 −5 shared/src/main/scala/scodec/SizeBound.scala
+20 −21 shared/src/main/scala/scodec/Transform.scala
+1 −2 shared/src/main/scala/scodec/codecs/ByteCodec.scala
+1 −2 shared/src/main/scala/scodec/codecs/CertificateCodec.scala
+10 −18 shared/src/main/scala/scodec/codecs/ChecksumCodec.scala
+1 −2 shared/src/main/scala/scodec/codecs/ChecksumFactory.scala
+5 −11 shared/src/main/scala/scodec/codecs/CipherCodec.scala
+1 −3 shared/src/main/scala/scodec/codecs/ConditionalCodec.scala
+2 −4 shared/src/main/scala/scodec/codecs/ConstrainedVariableSizeCodec.scala
+10 −18 shared/src/main/scala/scodec/codecs/DiscriminatorCodec.scala
+2 −4 shared/src/main/scala/scodec/codecs/FixedSizeCodec.scala
+2 −4 shared/src/main/scala/scodec/codecs/FixedSizeStrictCodec.scala
+4 −5 shared/src/main/scala/scodec/codecs/IntCodec.scala
+2 −4 shared/src/main/scala/scodec/codecs/LongCodec.scala
+5 −10 shared/src/main/scala/scodec/codecs/MultiplexedCodec.scala
+1 −2 shared/src/main/scala/scodec/codecs/NeedDiscriminatorCodec.scala
+3 −5 shared/src/main/scala/scodec/codecs/PaddedFixedSizeCodec.scala
+1 −2 shared/src/main/scala/scodec/codecs/ProvideCodec.scala
+2 −4 shared/src/main/scala/scodec/codecs/ShortCodec.scala
+9 −14 shared/src/main/scala/scodec/codecs/SignatureCodec.scala
+4 −1 shared/src/main/scala/scodec/codecs/UuidCodec.scala
+14 −17 shared/src/main/scala/scodec/codecs/VarLongCodec.scala
+5 −1 shared/src/main/scala/scodec/codecs/VarPackedDecimalCodec.scala
+5 −6 shared/src/main/scala/scodec/codecs/VariableSizeDelimitedCodec.scala
+0 −1 shared/src/main/scala/scodec/codecs/VectorCodec.scala
+199 −376 shared/src/main/scala/scodec/codecs/codecs.scala
+34 −0 shared/src/main/scala/scodec/compat.scala
+5 −2 testkit/shared/src/main/scala/scodec/CodecSuite.scala
+24 −7 unitTests/src/test/scala/scodec/CodecTest.scala
+4 −1 unitTests/src/test/scala/scodec/DecoderTest.scala
+6 −2 unitTests/src/test/scala/scodec/DerivedCodecTest.scala
+5 −2 unitTests/src/test/scala/scodec/SizeBoundTest.scala
+46 −22 unitTests/src/test/scala/scodec/codecs/BooleanCodecTest.scala
+12 −6 unitTests/src/test/scala/scodec/codecs/ByteAlignedCodecTest.scala
+18 −9 unitTests/src/test/scala/scodec/codecs/ByteCodecTest.scala
+8 −5 unitTests/src/test/scala/scodec/codecs/BytesCodecTest.scala
+27 −15 unitTests/src/test/scala/scodec/codecs/BytesStrictCodecTest.scala
+33 −17 unitTests/src/test/scala/scodec/codecs/ChecksumCodecTest.scala
+0 −1 unitTests/src/test/scala/scodec/codecs/ConditionalCodecTest.scala
+12 −6 unitTests/src/test/scala/scodec/codecs/ConstantCodecTest.scala
+44 −20 unitTests/src/test/scala/scodec/codecs/ConstrainedVariableSizeCodecTest.scala
+22 −8 unitTests/src/test/scala/scodec/codecs/DiscriminatorCodecTest.scala
+12 −6 unitTests/src/test/scala/scodec/codecs/FixedSizeCodecTest.scala
+3 −4 unitTests/src/test/scala/scodec/codecs/FletcherChecksumTest.scala
+4 −1 unitTests/src/test/scala/scodec/codecs/IgnoreCodecTest.scala
+19 −10 unitTests/src/test/scala/scodec/codecs/IntCodecTest.scala
+12 −6 unitTests/src/test/scala/scodec/codecs/LimitedSizeCodecTest.scala
+18 −9 unitTests/src/test/scala/scodec/codecs/ListCodecTest.scala
+7 −4 unitTests/src/test/scala/scodec/codecs/LongCodecTest.scala
+6 −3 unitTests/src/test/scala/scodec/codecs/PackedDecimalCodecTest.scala
+81 −42 unitTests/src/test/scala/scodec/codecs/PaddedFixedSizeCodecTest.scala
+44 −23 unitTests/src/test/scala/scodec/codecs/PaddedVarAlignedCodecTest.scala
+24 −18 unitTests/src/test/scala/scodec/codecs/RecoverCodecTest.scala
+18 −9 unitTests/src/test/scala/scodec/codecs/ShortCodecTest.scala
+20 −11 unitTests/src/test/scala/scodec/codecs/StringCodecTest.scala
+12 −6 unitTests/src/test/scala/scodec/codecs/TupleCodecTest.scala
+20 −6 unitTests/src/test/scala/scodec/codecs/VarLongCodecTest.scala
+56 −29 unitTests/src/test/scala/scodec/codecs/VariableSizeCodecTest.scala
+18 −9 unitTests/src/test/scala/scodec/codecs/VariableSizeDelimitedCodecTest.scala
+40 −19 unitTests/src/test/scala/scodec/codecs/VariableSizePrefixedCodecTest.scala
+30 −15 unitTests/src/test/scala/scodec/codecs/VectorCodecTest.scala
+24 −21 unitTests/src/test/scala/scodec/examples/CustomDelimitedExample.scala
+7 −2 unitTests/src/test/scala/scodec/examples/DerivedCodecExamples.scala
+32 −33 unitTests/src/test/scala/scodec/examples/MpegPacketExample.scala
+30 −25 unitTests/src/test/scala/scodec/examples/PcapExample.scala
+1 −1 unitTests/src/test/scala/scodec/examples/Performance.scala
+10 −17 unitTests/src/test/scala/scodec/examples/ProductsExample.scala
+12 −5 unitTests/src/test/scala/scodec/examples/TlvExample.scala
2 changes: 1 addition & 1 deletion community-build/community-projects/scodec-bits
Submodule scodec-bits updated 31 files
+102 −34 .github/workflows/ci.yml
+1 −1 .github/workflows/clean.yml
+11 −1 .scalafmt.conf
+5 −2 benchmark/src/main/scala/ScodecBitsBenchmark.scala
+57 −55 build.sbt
+35 −0 core/js/src/main/scala/scodec/bits/BitVectorCompanionCrossPlatform.scala
+33 −0 core/js/src/main/scala/scodec/bits/BitVectorCrossPlatform.scala
+53 −0 core/js/src/main/scala/scodec/bits/ByteVectorCompanionCrossPlatform.scala
+76 −0 core/js/src/main/scala/scodec/bits/ByteVectorCrossPlatform.scala
+92 −0 core/js/src/test/scala/scodec/bits/ByteVectorJsTest.scala
+35 −0 core/jvm/src/main/scala/scodec/bits/BitVectorCompanionCrossPlatform.scala
+179 −0 core/jvm/src/main/scala/scodec/bits/BitVectorCrossPlatform.scala
+35 −0 core/jvm/src/main/scala/scodec/bits/ByteVectorCompanionCrossPlatform.scala
+217 −0 core/jvm/src/main/scala/scodec/bits/ByteVectorCrossPlatform.scala
+1 −1 core/jvm/src/test/scala/scodec/bits/BitVectorJvmTest.scala
+1 −1 core/jvm/src/test/scala/scodec/bits/ByteVectorJvmTest.scala
+16 −12 core/shared/src/main/scala-2/scodec/bits/package.scala
+1 −1 core/shared/src/main/scala-3/scodec/bits/BitVectorPlatform.scala
+1 −1 core/shared/src/main/scala-3/scodec/bits/ByteVectorPlatform.scala
+14 −14 core/shared/src/main/scala-3/scodec/bits/Interpolators.scala
+25 −9 core/shared/src/main/scala/scodec/bits/Bases.scala
+313 −327 core/shared/src/main/scala/scodec/bits/BitVector.scala
+50 −24 core/shared/src/main/scala/scodec/bits/BitwiseOperations.scala
+2 −1 core/shared/src/main/scala/scodec/bits/ByteOrdering.scala
+342 −368 core/shared/src/main/scala/scodec/bits/ByteVector.scala
+139 −65 core/shared/src/main/scala/scodec/bits/crc.scala
+6 −0 core/shared/src/test/scala/scodec/bits/BitVectorTest.scala
+62 −1 core/shared/src/test/scala/scodec/bits/ByteVectorTest.scala
+12 −0 core/shared/src/test/scala/scodec/bits/CrcTest.scala
+1 −1 project/build.properties
+3 −8 project/plugins.sbt
2 changes: 1 addition & 1 deletion community-build/community-projects/sconfig
Submodule sconfig updated 230 files
2 changes: 1 addition & 1 deletion community-build/community-projects/spire
Submodule spire updated 128 files
2 changes: 1 addition & 1 deletion community-build/community-projects/zio
Submodule zio updated 716 files
Original file line number Diff line number Diff line change
@@ -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
25 changes: 12 additions & 13 deletions community-build/src/scala/dotty/communitybuild/projects.scala
Original file line number Diff line number Diff line change
@@ -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,
Original file line number Diff line number Diff line change
@@ -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()
5 changes: 2 additions & 3 deletions project/Build.scala
Original file line number Diff line number Diff line change
@@ -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
},

0 comments on commit 1092b35

Please sign in to comment.