Skip to content

Bump fs2 and enable for scala 3 #51

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 22, 2021
Merged

Bump fs2 and enable for scala 3 #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ val scalaTestVersion = "3.2.4"
val zioVersion = "1.0.4-2"
val fs2Version: Option[(Long, Long)] => String = {
case Some((2, 11)) => "2.1.0"
case _ => "2.5.2"
case _ => "2.5.3"
}

excludeLintKeys in Global ++= Set(ideSkipProject)
Expand Down Expand Up @@ -63,7 +63,7 @@ lazy val projectAggregates: Seq[ProjectReference] = if (sys.env.isDefinedAt("STT
println("[info] STTP_NATIVE *not* defined, *not* including sttp-native in the aggregate projects")
scala2.flatMap(v => List[ProjectReference](core.js(v), ws.js(v))) ++
scala2.flatMap(v => List[ProjectReference](core.jvm(v), ws.jvm(v), fs2.jvm(v), monix.jvm(v), zio.jvm(v))) ++
scala3.flatMap(v => List[ProjectReference](core.jvm(v), ws.jvm(v), zio.jvm(v))) ++
scala3.flatMap(v => List[ProjectReference](core.jvm(v), ws.jvm(v), fs2.jvm(v))) ++
List[ProjectReference](
akka.jvm(scala2_12),
akka.jvm(scala2_13),
Expand Down Expand Up @@ -137,7 +137,7 @@ lazy val fs2 = (projectMatrix in file("fs2"))
)
)
.jvmPlatform(
scalaVersions = scala2,
scalaVersions = scala2 ++ scala3,
settings = commonJvmSettings
)
.dependsOn(core)
Expand Down