Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to sbt-typelevel #315

Merged
merged 38 commits into from
Oct 9, 2022
Merged

Switch to sbt-typelevel #315

merged 38 commits into from
Oct 9, 2022

Conversation

satabin
Copy link
Member

@satabin satabin commented Apr 16, 2022

No description provided.

@satabin satabin marked this pull request as draft April 16, 2022 13:42
ybasket added 11 commits October 5, 2022 16:25
# Conflicts:
#	.github/workflows/ci.yml
#	build.sbt
#	cbor/shared/src/main/scala/fs2/data/cbor/CborException.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/HalfFloat.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/Tags.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/high/internal/ValueParser.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/high/internal/ValueSerializer.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/high/model.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/high/package.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/low/internal/ItemParser.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/low/internal/ItemValidator.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/low/internal/MajorType.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/low/model.scala
#	cbor/shared/src/main/scala/fs2/data/cbor/low/package.scala
#	cbor/shared/src/test/scala/fs2/data/cbor/ParserSpec.scala
#	cbor/shared/src/test/scala/fs2/data/cbor/ValidationSpec.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/auto.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/hlist.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/DerivedCellDecoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/DerivedCellEncoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/DerivedCsvRowDecoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/DerivedCsvRowEncoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/DerivedRowDecoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/DerivedRowEncoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/ExportMacros.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/MapShapedCsvRowDecoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/MapShapedCsvRowEncoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/SeqShapedRowDecoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/internal/SeqShapedRowEncoder.scala
#	csv/generic/shared/src/main/scala-2/fs2/data/csv/generic/semiauto.scala
#	csv/generic/shared/src/main/scala/fs2/data/csv/generic/CsvName.scala
#	csv/generic/shared/src/main/scala/fs2/data/csv/generic/CsvValue.scala
#	csv/generic/shared/src/test/scala-2/fs2/data/csv/generic/AutoDerivationTest.scala
#	csv/generic/shared/src/test/scala-2/fs2/data/csv/generic/HListDecoderDerivationTest.scala
#	csv/generic/shared/src/test/scala-2/fs2/data/csv/generic/HListEncoderDerivationTest.scala
#	csv/generic/shared/src/test/scala/fs2/data/csv/generic/CellDecoderTest.scala
#	csv/generic/shared/src/test/scala/fs2/data/csv/generic/CellEncoderTest.scala
#	csv/generic/shared/src/test/scala/fs2/data/csv/generic/CsvRowDecoderTest.scala
#	csv/generic/shared/src/test/scala/fs2/data/csv/generic/CsvRowEncoderTest.scala
#	csv/generic/shared/src/test/scala/fs2/data/csv/generic/RowDecoderTest.scala
#	csv/generic/shared/src/test/scala/fs2/data/csv/generic/RowEncoderTest.scala
#	csv/generic/shared/src/test/scala/fs2/data/csv/generic/models.scala
#	csv/js/src/main/scala/fs2/data/csv/PlatformCellDecoders.scala
#	csv/js/src/main/scala/fs2/data/csv/PlatformCellEncoders.scala
#	csv/jvm/src/main/scala/fs2/data/csv/PlatformCellDecoders.scala
#	csv/jvm/src/main/scala/fs2/data/csv/PlatformCellEncoders.scala
#	csv/shared/src/main/scala-2.13+/fs2/data/csv/LiteralCellDecoders.scala
#	csv/shared/src/main/scala-2.13+/fs2/data/csv/LiteralCellEncoders.scala
#	csv/shared/src/main/scala-2/fs2/data/csv/EnumDecoders.scala
#	csv/shared/src/main/scala-2/fs2/data/csv/EnumEncoders.scala
#	csv/shared/src/main/scala/fs2/data/csv/CellDecoder.scala
#	csv/shared/src/main/scala/fs2/data/csv/CellEncoder.scala
#	csv/shared/src/main/scala/fs2/data/csv/CsvRow.scala
#	csv/shared/src/main/scala/fs2/data/csv/CsvRowDecoder.scala
#	csv/shared/src/main/scala/fs2/data/csv/CsvRowEncoder.scala
#	csv/shared/src/main/scala/fs2/data/csv/EscapeMode.scala
#	csv/shared/src/main/scala/fs2/data/csv/Exported.scala
#	csv/shared/src/main/scala/fs2/data/csv/HasHeaders.scala
#	csv/shared/src/main/scala/fs2/data/csv/ParseableHeader.scala
#	csv/shared/src/main/scala/fs2/data/csv/Row.scala
#	csv/shared/src/main/scala/fs2/data/csv/RowDecoder.scala
#	csv/shared/src/main/scala/fs2/data/csv/RowDecoderF.scala
#	csv/shared/src/main/scala/fs2/data/csv/RowEncoder.scala
#	csv/shared/src/main/scala/fs2/data/csv/RowEncoderF.scala
#	csv/shared/src/main/scala/fs2/data/csv/RowF.scala
#	csv/shared/src/main/scala/fs2/data/csv/WriteableHeader.scala
#	csv/shared/src/main/scala/fs2/data/csv/exceptions.scala
#	csv/shared/src/main/scala/fs2/data/csv/internals/CsvRowParser.scala
#	csv/shared/src/main/scala/fs2/data/csv/internals/RowParser.scala
#	csv/shared/src/main/scala/fs2/data/csv/internals/RowWriter.scala
#	csv/shared/src/main/scala/fs2/data/csv/internals/State.scala
#	csv/shared/src/main/scala/fs2/data/csv/package.scala
#	csv/shared/src/test/scala-2.13+/fs2/data/csv/LiteralDecodersTest.scala
#	csv/shared/src/test/scala-2.13+/fs2/data/csv/LiteralEncodersTest.scala
#	csv/shared/src/test/scala/fs2/data/csv/CellDecoderTest.scala
#	csv/shared/src/test/scala/fs2/data/csv/CellEncoderTest.scala
#	csv/shared/src/test/scala/fs2/data/csv/CsvExceptionSpec.scala
#	csv/shared/src/test/scala/fs2/data/csv/CsvParserTest.scala
#	csv/shared/src/test/scala/fs2/data/csv/JavaTimeRoundTripTest.scala
#	csv/shared/src/test/scala/fs2/data/csv/LineNumberPreservationTest.scala
#	csv/shared/src/test/scala/fs2/data/csv/RowFTest.scala
#	csv/shared/src/test/scala/fs2/data/csv/RowWriterTest.scala
#	json/circe/src/main/scala/fs2/data/json/circe/package.scala
#	json/circe/src/test/scala/fs2/data/json/circe/JsonExceptionSpec.scala
#	json/circe/src/test/scala/fs2/data/json/circe/JsonMergePatchTest.scala
#	json/circe/src/test/scala/fs2/data/json/circe/JsonParserSpec.scala
#	json/circe/src/test/scala/fs2/data/json/circe/JsonSelectorSpec.scala
#	json/circe/src/test/scala/fs2/data/json/circe/TokenizerSpec.scala
#	json/diffson/src/main/scala/fs2/data/json/mergepatch/package.scala
#	json/diffson/src/test/scala/fs2/data/json/mergepatch/JsonMergePatchTest.scala
#	json/interpolators/src/main/scala-2/fs2/data/json/interpolators/SelectorInterpolator.scala
#	json/interpolators/src/main/scala-2/fs2/data/json/interpolators/package.scala
#	json/interpolators/src/test/scala/fs2/data/json/interpolators/JsonInterpolatorsTest.scala
#	json/src/main/scala/fs2/data/json/JsonContext.scala
#	json/src/main/scala/fs2/data/json/JsonException.scala
#	json/src/main/scala/fs2/data/json/SelectorParser.scala
#	json/src/main/scala/fs2/data/json/ast/Builder.scala
#	json/src/main/scala/fs2/data/json/ast/Tokenizer.scala
#	json/src/main/scala/fs2/data/json/ast/package.scala
#	json/src/main/scala/fs2/data/json/codec/Deserializer.scala
#	json/src/main/scala/fs2/data/json/codec/Serializer.scala
#	json/src/main/scala/fs2/data/json/codec/package.scala
#	json/src/main/scala/fs2/data/json/internal/NumberState.scala
#	json/src/main/scala/fs2/data/json/internal/ObjectWrapper.scala
#	json/src/main/scala/fs2/data/json/internal/Renderer.scala
#	json/src/main/scala/fs2/data/json/internal/State.scala
#	json/src/main/scala/fs2/data/json/internal/StringState.scala
#	json/src/main/scala/fs2/data/json/internal/TokenParser.scala
#	json/src/main/scala/fs2/data/json/internal/TokenSelector.scala
#	json/src/main/scala/fs2/data/json/internal/ValueParser.scala
#	json/src/main/scala/fs2/data/json/internal/package.scala
#	json/src/main/scala/fs2/data/json/package.scala
#	json/src/main/scala/fs2/data/json/selector/dsl.scala
#	json/src/main/scala/fs2/data/json/selector/package.scala
#	json/src/main/scala/fs2/data/json/selectors.scala
#	json/src/main/scala/fs2/data/json/tokens.scala
#	json/src/test/scala/fs2/data/json/JsonExceptionSpec.scala
#	json/src/test/scala/fs2/data/json/JsonParsertest.scala
#	json/src/test/scala/fs2/data/json/JsonSelectorSpec.scala
#	json/src/test/scala/fs2/data/json/RenderSpec.scala
#	json/src/test/scala/fs2/data/json/TokenizerSpec.scala
#	project/plugins.sbt
#	text/shared/src/main/scala/fs2/data/text/CharLikeChunks.scala
#	text/shared/src/main/scala/fs2/data/text/package.scala
#	xml/src/main/scala/fs2/data/xml/Attr.scala
#	xml/src/main/scala/fs2/data/xml/QName.scala
#	xml/src/main/scala/fs2/data/xml/XmlEvent.scala
#	xml/src/main/scala/fs2/data/xml/XmlException.scala
#	xml/src/main/scala/fs2/data/xml/errors.scala
#	xml/src/main/scala/fs2/data/xml/internals/EventParser.scala
#	xml/src/main/scala/fs2/data/xml/internals/MarkupToken.scala
#	xml/src/main/scala/fs2/data/xml/internals/NamespaceResolver.scala
#	xml/src/main/scala/fs2/data/xml/internals/Normalizer.scala
#	xml/src/main/scala/fs2/data/xml/internals/ReferenceResolver.scala
#	xml/src/main/scala/fs2/data/xml/internals/package.scala
#	xml/src/main/scala/fs2/data/xml/package.scala
#	xml/src/test/scala/fs2/data/xml/EventParserTest.scala
#	xml/src/test/scala/fs2/data/xml/NormalizationTest.scala
#	xml/src/test/scala/fs2/data/xml/XmlExceptionSpec.scala
# Conflicts:
#	.github/workflows/ci.yml
#	build.sbt
#	project/plugins.sbt
build.sbt Outdated
Comment on lines 32 to 33
Compile / unmanagedSourceDirectories ++= {
def extraDirs(suffix: String) =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can probably clean this up, sbt-typelevel already configures it.

Using a mix of adding package-private stubs for what was there before and just ignoring certain bincompat breaks vi filters.
@ybasket ybasket marked this pull request as ready for review October 9, 2022 07:17
@ybasket ybasket requested a review from a team as a code owner October 9, 2022 07:17
# Conflicts:
#	finite-state/shared/src/main/scala/fs2/data/pattern/Compiler.scala
#	finite-state/shared/src/main/scala/fs2/data/pattern/Heuristic.scala
#	finite-state/shared/src/main/scala/fs2/data/pattern/Matrix.scala
#	finite-state/shared/src/main/scala/fs2/data/pattern/package.scala
#	finite-state/shared/src/test/scala/fs2/data/pattern/example/PatternSpec.scala
Lead to CI and local failures, sbt recommends running without it.
@satabin satabin merged commit f2dd6e3 into main Oct 9, 2022
@satabin satabin deleted the sbt-typelevel branch October 9, 2022 13:13
@satabin satabin added enhancement New feature or request infrastructure labels Oct 9, 2022
@satabin satabin added this to the 1.6.0 milestone Oct 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request infrastructure
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants