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
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1ffa258
Switch to sbt-typelevel
satabin Apr 16, 2022
ad9b393
Update License headers
satabin Apr 16, 2022
ec486c9
Remove custom compiler options
satabin Apr 25, 2022
6f0444b
Merge branch 'main' into sbt-typelevel
ybasket Oct 5, 2022
184716b
Updates
ybasket Oct 5, 2022
28c1782
Disable site publishing to be able to test it without damage
ybasket Oct 5, 2022
7696c73
Disable fatal warnings when building site
ybasket Oct 5, 2022
00b69b9
Upload site artifact
ybasket Oct 5, 2022
dd848db
Specify ruby version
ybasket Oct 5, 2022
afea03c
Fix license headers
ybasket Oct 5, 2022
8c5c99c
Don't explicitly specify Scala version in site build
ybasket Oct 5, 2022
504c8c2
Re-enablesite publishing
ybasket Oct 7, 2022
afcdde1
Merge branch 'main' into sbt-typelevel
ybasket Oct 7, 2022
e399b7a
Fixes after merging
ybasket Oct 7, 2022
7a1a81e
Make unidoc filter inclusive
ybasket Oct 7, 2022
538311c
NoPublishPlugin, fixed aggregate
ybasket Oct 7, 2022
2bc0be9
Fix more warnings
ybasket Oct 7, 2022
969d718
Fix more warnings (2)
ybasket Oct 7, 2022
1ee367b
Merge branch 'main' into sbt-typelevel
ybasket Oct 8, 2022
26a633f
Migrate from cats.implicits
ybasket Oct 8, 2022
edcfad6
Fix all warnings in main code
ybasket Oct 8, 2022
9145f50
Stricter bincompat workaround
ybasket Oct 8, 2022
6d40db2
Fix warnings in tests
ybasket Oct 8, 2022
d98867d
Generate some missing headers
ybasket Oct 8, 2022
d5f37a6
scalafmt
ybasket Oct 8, 2022
e4befe6
Fix MiMa errors
ybasket Oct 8, 2022
3401682
Finetune MiMa fixes
ybasket Oct 8, 2022
57a793f
Final MiMa fixes
ybasket Oct 8, 2022
44ce954
Fix warning for deprecated HalfFloat
ybasket Oct 8, 2022
45ded85
Fix API docs
ybasket Oct 8, 2022
aa7539b
Fix API docs on 2.12
ybasket Oct 9, 2022
a1e9eb0
Use sbt-typelevel's folder magic for version sources
ybasket Oct 9, 2022
5939f7e
Fix MiMa on JS and Native
ybasket Oct 9, 2022
4539266
Handle bincompat for csv better
ybasket Oct 9, 2022
1cffbe7
Merge branch 'main' into sbt-typelevel
ybasket Oct 9, 2022
2c607c7
Fix warning in new code coming from main
ybasket Oct 9, 2022
6d68fce
Remove metaspace JVM argument
ybasket Oct 9, 2022
35008c7
Add missing license headers
ybasket Oct 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix more warnings
ybasket committed Oct 7, 2022
commit 2bc0be96bbbcf0aecd232f8b8d3801fe78f6e385
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ val commonSettings = List(
}
.toList
.flatten,
scalacOptions ++= onScala3(scalaVersion.value)(List("-source:3.2-migration", "-no-indent")),
testFrameworks += new TestFramework("weaver.framework.CatsEffect"),
scmInfo := Some(ScmInfo(url("https://github.com/satabin/fs2-data"), "scm:git:[email protected]:satabin/fs2-data.git"))
)
6 changes: 3 additions & 3 deletions cbor/shared/src/test/scala/fs2/data/cbor/ParserSpec.scala
Original file line number Diff line number Diff line change
@@ -459,13 +459,13 @@ object ParserSpec extends SimpleIOSuite {
.foldMonoid
.map(jawn.parse(_).flatMap(_.as[List[AppendixTestCase]]))
.rethrow
.map(_.zipWithIndex.collect { case (AppendixTestCase(cbor, _, _, _, Some(diag1), diag2), idx) =>
(idx, cbor, diag1, diag2)
.map(_.collect { case AppendixTestCase(cbor, _, _, _, Some(diag1), diag2) =>
(cbor, diag1, diag2)
})
.flatMap(
Stream
.emits(_)
.evalMap { case (idx, cbor, expected, expectedAlt) =>
.evalMap { case (cbor, expected, expectedAlt) =>
Stream
.chunk(Chunk.byteVector(cbor))
.through(items[IO])
Original file line number Diff line number Diff line change
@@ -17,10 +17,10 @@
package fs2.data.esp

/** A typeclass that describes how to transform an input tag into an output tag. */
trait Tag2Tag[InTag, OutTag] {
@FunctionalInterface trait Tag2Tag[InTag, OutTag] {
def convert(tag: InTag): OutTag
}

object Tag2Tag {
implicit def same[Tag]: Tag2Tag[Tag, Tag] = identity
implicit def same[T]: Tag2Tag[T, T] = identity
}
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ object Pattern {

override def decompose(pat: Pattern): List[Skeleton[Tag]] =
pat match {
case VarPat(tpe, name) =>
case VarPat(_, name) =>
List(Skeleton.Wildcard(name.some))
case IntPat(v) =>
List(Skeleton.Constructor(Tag.IntTag(v), Nil))
@@ -66,7 +66,7 @@ object Pattern {
decompose(left) ++ decompose(right)
case AsPat(inner, name) =>
decompose(inner).map(Skeleton.As(_, name))
case WildPat(tpe) =>
case WildPat(_) =>
List(Skeleton.Wildcard(none))
}

2 changes: 1 addition & 1 deletion json/src/main/scala/fs2/data/json/JsonContext.scala
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ package data
package json

import cats.Show
import cats.implicits._
import cats.syntax.all._

/** A JSON trace context, positioning the current location in the JSON value
* starting from the root.
32 changes: 18 additions & 14 deletions xml/src/main/scala/fs2/data/xml/dom/TreeParser.scala
Original file line number Diff line number Diff line change
@@ -133,20 +133,24 @@ class TreeParser[F[_], Node](implicit F: RaiseThrowable[F]) {
builder: DocumentBuilder[Node]): Pull[F, Node, (Chunk[XmlEvent], Int, Stream[F, XmlEvent])] =
next(chunk, idx, rest).flatMap {
case (XmlEvent.StartDocument, chunk, idx, rest) =>
for {
(decl, doctype, prolog, chunk, idx, rest) <- prolog(chunk, idx, rest)
(node, chunk, idx, rest) <- element(chunk, idx, rest)
(postlog, chunk, idx, rest) <- postlog(chunk, idx, rest)
(chunk, idx, rest) <- expect(XmlEvent.EndDocument, chunk, idx, rest)
() <- Pull.output1(
builder.makeDocument(decl.map(_.version),
decl.flatMap(_.encoding),
decl.flatMap(_.standalone),
doctype,
prolog,
node,
postlog))
} yield (chunk, idx, rest)
prolog(chunk, idx, rest).flatMap { case (decl, doctype, prolog, chunk, idx, rest) =>
element(chunk, idx, rest).flatMap { case (node, chunk, idx, rest) =>
postlog(chunk, idx, rest).flatMap { case (postlog, chunk, idx, rest) =>
expect(XmlEvent.EndDocument, chunk, idx, rest).flatMap { case (chunk, idx, rest) =>
Pull
.output1(
builder.makeDocument(decl.map(_.version),
decl.flatMap(_.encoding),
decl.flatMap(_.standalone),
doctype,
prolog,
node,
postlog))
.as((chunk, idx, rest))
}
}
}
}
case (evt, _, _, _) => Pull.raiseError(new XmlTreeException(s"unexpected event '$evt'"))
}

Original file line number Diff line number Diff line change
@@ -953,7 +953,7 @@ private[xml] object EventParser {
.flatMap {
case (ctx, chunkAcc, '>') =>
// done
Pull.pure(ctx, chunkAcc += XmlEvent.XmlDoctype(name, docname, systemid))
Pull.pure((ctx, chunkAcc += XmlEvent.XmlDoctype(name, docname, systemid)))
case (ctx, chunkAcc, '[') =>
skipInternalDTD(ctx, chunkAcc).map { case (ctx, chunkAcc) =>
(ctx, chunkAcc += XmlEvent.XmlDoctype(name, docname, systemid))
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ package xml
package internals

import cats._
import cats.implicits._
import cats.syntax.all._

private case class ResolverEnv(parent: Option[ResolverEnv], nss: Map[String, String], depth: Int) {
def resolve(prefix: String): Option[String] =
@@ -75,7 +75,7 @@ private[xml] class NamespaceResolver[F[_]](implicit F: MonadError[F, Throwable])

private def resolve(env: ResolverEnv, name: QName, withDefault: Boolean): F[QName] =
name match {
case QName(Some(pfx), local) if pfx.take(3).toLowerCase =!= "xml" =>
case QName(Some(pfx), _) if pfx.take(3).toLowerCase =!= "xml" =>
// prefixes starting by `xml` are reserved
env.resolve(pfx) match {
case None => F.raiseError(new XmlException(NSCPrefixDeclared, s"undeclared namespace $pfx"))
2 changes: 0 additions & 2 deletions xml/src/main/scala/fs2/data/xml/internals/Normalizer.scala
Original file line number Diff line number Diff line change
@@ -19,8 +19,6 @@ package data
package xml
package internals

import cats.implicits._

import fs2._

private[xml] object Normalizer {
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ package xml
package internals

import cats._
import cats.implicits._
import cats.syntax.all._

private[xml] class ReferenceResolver[F[_]](entities: Map[String, String])(implicit F: MonadError[F, Throwable]) {