Skip to content

Commit 43a95cd

Browse files
committed
Merge branch 'main' into update/scalafmt-core-3.11.1
2 parents b6c3435 + c9efcdb commit 43a95cd

10 files changed

Lines changed: 29 additions & 22 deletions

File tree

build.sbt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ThisBuild / startYear := Some(2013)
1414
val Scala213 = "2.13.18"
1515

1616
ThisBuild / scalaVersion := Scala213
17-
ThisBuild / crossScalaVersions := Seq("2.12.21", Scala213, "3.3.7")
17+
ThisBuild / crossScalaVersions := Seq("2.12.21", Scala213, "3.3.8")
1818
ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")
1919

2020
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest")
@@ -367,6 +367,11 @@ ThisBuild / mimaBinaryIssueFilters ++= Seq(
367367
)
368368
)
369369

370+
// Disables unused import warnings on generated source due to https://github.com/sbt-doctest/sbt-doctest/issues/779
371+
lazy val disableImportWarningsOnDoctestSource = Seq(
372+
Test / scalacOptions += "-Wconf:msg=unused import&src=.*[/\\\\]src_managed[/\\\\].*:s"
373+
)
374+
370375
lazy val root = tlCrossRootProject
371376
.aggregate(
372377
core,
@@ -387,17 +392,18 @@ lazy val commonNativeSettings = Seq[Setting[?]](
387392

388393
lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
389394
.in(file("core"))
395+
.settings(disableImportWarningsOnDoctestSource)
390396
.settings(
391397
name := "fs2-core",
392398
libraryDependencies ++= Seq(
393399
"org.scodec" %%% "scodec-bits" % "1.2.5",
394400
"org.typelevel" %%% "cats-core" % "2.13.0",
395401
"org.typelevel" %%% "cats-effect" % "3.7.0",
396-
"org.typelevel" %%% "cats-mtl" % "1.6.0",
402+
"org.typelevel" %%% "cats-mtl" % "1.7.0",
397403
"org.typelevel" %%% "cats-effect-laws" % "3.7.0" % Test,
398404
"org.typelevel" %%% "cats-effect-testkit" % "3.7.0" % Test,
399405
"org.typelevel" %%% "cats-laws" % "2.13.0" % Test,
400-
"org.typelevel" %%% "cats-mtl-laws" % "1.6.0" % Test,
406+
"org.typelevel" %%% "cats-mtl-laws" % "1.7.0" % Test,
401407
"org.typelevel" %%% "discipline-munit" % "2.0.0" % Test,
402408
"org.typelevel" %%% "munit-cats-effect" % "2.2.0" % Test,
403409
"org.typelevel" %%% "scalacheck-effect-munit" % "2.1.0" % Test
@@ -445,6 +451,7 @@ lazy val integration = project
445451

446452
lazy val io = crossProject(JVMPlatform, JSPlatform, NativePlatform)
447453
.in(file("io"))
454+
.settings(disableImportWarningsOnDoctestSource)
448455
.settings(
449456
name := "fs2-io",
450457
tlVersionIntroduced ~= { _.updated("3", "3.1.0") },
@@ -555,6 +562,7 @@ lazy val protocols = crossProject(JVMPlatform, JSPlatform, NativePlatform)
555562

556563
lazy val reactiveStreams = project
557564
.in(file("reactive-streams"))
565+
.settings(disableImportWarningsOnDoctestSource)
558566
.settings(
559567
name := "fs2-reactive-streams",
560568
libraryDependencies ++= Seq(

core/shared/src/main/scala/fs2/Chunk.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ abstract class Chunk[+O] extends Serializable with ChunkPlatform[O] with ChunkRu
570570
asSeqPlatform.getOrElse(this match {
571571
case indexedSeqChunk: Chunk.IndexedSeqChunk[?] =>
572572
indexedSeqChunk.s match {
573-
case indexedSeq: IndexedSeq[O] =>
573+
case indexedSeq: IndexedSeq[O] @unchecked =>
574574
indexedSeq
575575

576576
case _ =>
@@ -787,7 +787,7 @@ object Chunk
787787
array(bldr.result()).asInstanceOf[Chunk[O]]
788788
}
789789

790-
case s: GIndexedSeq[O] =>
790+
case s: GIndexedSeq[O] @unchecked =>
791791
if (s.isEmpty) empty
792792
else if (s.size == 1) singleton(s.head)
793793
else new IndexedSeqChunk(s)

core/shared/src/main/scala/fs2/Pull.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import scala.annotation.{nowarn, tailrec}
2525
import scala.concurrent.duration.FiniteDuration
2626
import scala.util.control.NonFatal
2727

28-
import cats.{Eval => _, _}
28+
import cats.{Applicative, Id, MonadError, ~>}
2929
import cats.effect.kernel._
3030
import cats.syntax.all._
3131

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

io/jvm-native/src/test/scala/fs2/io/IoPlatformSuite.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,7 @@ class IoPlatformSuite extends Fs2Suite {
275275
bar.assertEquals("bar")
276276
}
277277
test("classloader") {
278-
val resourcePath = if (isNative) "/fs2/io/foo" else "fs2/io/foo"
279-
val size = readClassLoaderResource[IO](resourcePath, 8192).as(1L).compile.foldMonoid
278+
val size = readClassLoaderResource[IO]("fs2/io/foo", 8192).as(1L).compile.foldMonoid
280279
size.assertEquals(3L)
281280
}
282281
}

io/native/src/main/scala/fs2/io/net/FdPollingIpSocketsProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import fs2.io.internal.syssocket.{connect => sconnect, bind => sbind, _}
3535

3636
import scala.scalanative.meta.LinktimeInfo
3737
import scala.scalanative.posix.errno._
38-
import scala.scalanative.posix.sys.socket.{bind => _, connect => _, accept => _, _}
38+
import scala.scalanative.posix.sys.socket.{accept => _, _}
3939
import scala.scalanative.posix.unistd._
4040

4141
private final class FdPollingIpSocketsProvider[F[_]: Dns: LiftIO](implicit F: Async[F])

io/native/src/main/scala/fs2/io/net/FdPollingUnixSocketsProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import fs2.io.internal.sysunOps._
3737

3838
import scala.scalanative.meta.LinktimeInfo
3939
import scala.scalanative.posix.string._
40-
import scala.scalanative.posix.sys.socket.{bind => _, connect => _, accept => _, _}
40+
import scala.scalanative.posix.sys.socket.{accept => _, _}
4141
import scala.scalanative.posix.unistd._
4242
import scala.scalanative.unsafe._
4343
import scala.scalanative.unsigned._

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.12.11
1+
sbt.version=1.12.13

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
val sbtTypelevelVersion = "0.8.5"
1+
val sbtTypelevelVersion = "0.8.6"
22
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
33
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
4-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0")
5-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.11")
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
5+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.12")
66
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.4.0")
7-
addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.12.5")
7+
addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.13.0")
88
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
99

1010
libraryDependencySchemes += "com.lihaoyi" %% "geny" % VersionScheme.Always

scalafix/project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.12.11
1+
sbt.version=1.12.13

0 commit comments

Comments
 (0)