Skip to content

Commit 98e599a

Browse files
committed
Update to Scala3
1 parent b1dce81 commit 98e599a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

build.sbt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ val scala2_11 = "2.11.12"
44
val scala2_12 = "2.12.13"
55
val scala2_13 = "2.13.5"
66
val scala2 = List(scala2_11, scala2_12, scala2_13)
7-
val scala3 = List("3.0.0-RC3")
7+
val scala3 = List("3.0.0")
88

9-
val sttpModelVersion = "1.4.6"
9+
val sttpModelVersion = "1.4.7"
1010

11-
val scalaTestVersion = "3.2.8"
11+
val scalaTestVersion = "3.2.9"
1212
val zioVersion = "1.0.7"
1313
val fs2_2_version: Option[(Long, Long)] => String = {
1414
case Some((2, 11)) => "2.1.0"
15-
case _ => "2.5.5"
15+
case _ => "2.5.6"
1616
}
17-
val fs2_3_version = "3.0.2"
17+
val fs2_3_version = "3.0.3"
1818

1919
excludeLintKeys in Global ++= Set(ideSkipProject)
2020

@@ -167,14 +167,14 @@ lazy val fs2 = (projectMatrix in file("fs2"))
167167
lazy val monix = (projectMatrix in file("monix"))
168168
.settings(
169169
name := "monix",
170-
libraryDependencies += "io.monix" %%% "monix" % "3.3.0"
170+
libraryDependencies += "io.monix" %%% "monix" % "3.4.0"
171171
)
172172
.jvmPlatform(
173-
scalaVersions = scala2,
173+
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
174174
settings = commonJvmSettings
175175
)
176176
.jsPlatform(
177-
scalaVersions = List(scala2_12, scala2_13),
177+
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
178178
settings = commonJsSettings ++ browserChromeTestSettings
179179
)
180180
.dependsOn(core)
@@ -185,11 +185,11 @@ lazy val zio = (projectMatrix in file("zio"))
185185
libraryDependencies ++= Seq("dev.zio" %% "zio-streams" % zioVersion, "dev.zio" %% "zio" % zioVersion)
186186
)
187187
.jvmPlatform(
188-
scalaVersions = scala2 ++ scala3,
188+
scalaVersions = scala2,
189189
settings = commonJvmSettings
190190
)
191191
.jsPlatform(
192-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
192+
scalaVersions = List(scala2_12, scala2_13),
193193
settings = commonJsSettings ++ browserChromeTestSettings
194194
)
195195
.dependsOn(core)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
33
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")
44
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.8.0")
55

6-
val sbtSoftwareMillVersion = "2.0.3"
6+
val sbtSoftwareMillVersion = "2.0.4"
77
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
88
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
99
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-browser-test-js" % sbtSoftwareMillVersion)

0 commit comments

Comments
 (0)