Skip to content

Commit d5950fa

Browse files
committed
Update scala
1 parent 8646c4f commit d5950fa

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

build.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ import com.softwaremill.SbtSoftwareMillBrowserTestJS._
22

33
val scala2_11 = "2.11.12"
44
val scala2_12 = "2.12.13"
5-
val scala2_13 = "2.13.4"
5+
val scala2_13 = "2.13.5"
66
val scala2 = List(scala2_11, scala2_12, scala2_13)
7-
val scala3 = List("3.0.0-RC1")
7+
val scala3 = List("3.0.0-RC2")
88

9-
val sttpModelVersion = "1.4.0"
9+
val sttpModelVersion = "1.4.1"
1010

11-
val scalaTestVersion = "3.2.6"
11+
val scalaTestVersion = "3.2.7"
1212
val zioVersion = "1.0.5"
1313
val fs2Version: Option[(Long, Long)] => String = {
1414
case Some((2, 11)) => "2.1.0"
15-
case _ => "2.5.3"
15+
case _ => "2.5.4"
1616
}
1717

1818
excludeLintKeys in Global ++= Set(ideSkipProject)
@@ -34,7 +34,7 @@ val commonJvmSettings = commonSettings ++ Seq(
3434

3535
val commonJsSettings = commonSettings ++ Seq(
3636
ideSkipProject := true,
37-
scalacOptions in Compile ++= {
37+
Compile / scalacOptions ++= {
3838
if (isSnapshot.value) Seq.empty
3939
else
4040
Seq {
@@ -78,7 +78,7 @@ val compileAndTest = "compile->compile;test->test"
7878

7979
lazy val rootProject = (project in file("."))
8080
.settings(commonSettings: _*)
81-
.settings(skip in publish := true, name := "sttp-shared", scalaVersion := scala2_13)
81+
.settings(publish / skip := true, name := "sttp-shared", scalaVersion := scala2_13)
8282
.aggregate(projectAggregates: _*)
8383

8484
lazy val core = (projectMatrix in file("core"))

project/plugins.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % s
88
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
99
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-browser-test-js" % sbtSoftwareMillVersion)
1010

11-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")
12-
1311
addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")

0 commit comments

Comments
 (0)