Skip to content

Commit 84a7cf3

Browse files
authored
Merge pull request #51 from aeons/update
Bump fs2 and enable for scala 3
2 parents bde8678 + 23a0f61 commit 84a7cf3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ val scalaTestVersion = "3.2.4"
1212
val zioVersion = "1.0.4-2"
1313
val fs2Version: Option[(Long, Long)] => String = {
1414
case Some((2, 11)) => "2.1.0"
15-
case _ => "2.5.2"
15+
case _ => "2.5.3"
1616
}
1717

1818
excludeLintKeys in Global ++= Set(ideSkipProject)
@@ -63,7 +63,7 @@ lazy val projectAggregates: Seq[ProjectReference] = if (sys.env.isDefinedAt("STT
6363
println("[info] STTP_NATIVE *not* defined, *not* including sttp-native in the aggregate projects")
6464
scala2.flatMap(v => List[ProjectReference](core.js(v), ws.js(v))) ++
6565
scala2.flatMap(v => List[ProjectReference](core.jvm(v), ws.jvm(v), fs2.jvm(v), monix.jvm(v), zio.jvm(v))) ++
66-
scala3.flatMap(v => List[ProjectReference](core.jvm(v), ws.jvm(v), zio.jvm(v))) ++
66+
scala3.flatMap(v => List[ProjectReference](core.jvm(v), ws.jvm(v), fs2.jvm(v))) ++
6767
List[ProjectReference](
6868
akka.jvm(scala2_12),
6969
akka.jvm(scala2_13),
@@ -137,7 +137,7 @@ lazy val fs2 = (projectMatrix in file("fs2"))
137137
)
138138
)
139139
.jvmPlatform(
140-
scalaVersions = scala2,
140+
scalaVersions = scala2 ++ scala3,
141141
settings = commonJvmSettings
142142
)
143143
.dependsOn(core)

0 commit comments

Comments
 (0)