Skip to content

Commit 81f4d9d

Browse files
authored
Merge pull request #260 from softwaremill/update/sbt-scalajs-1.13.0
Update sbt-scalajs, scalajs-library_2.13, ... to 1.13.0
2 parents 1508f51 + 6eccc09 commit 81f4d9d

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

build.sbt

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ val scala2_11 = "2.11.12"
77
val scala2_12 = "2.12.17"
88
val scala2_13 = "2.13.10"
99
val scala2 = List(scala2_11, scala2_12, scala2_13)
10+
val scala2alive = List(scala2_12, scala2_13)
1011
val scala3 = List("3.2.2")
1112

12-
val sttpModelVersion = "1.5.4"
13+
val sttpModelVersion = "1.5.5"
1314

1415
val scalaTestVersion = "3.2.15"
1516
val zio1Version = "1.0.17"
@@ -106,11 +107,11 @@ lazy val core = (projectMatrix in file("core"))
106107
settings = commonJvmSettings
107108
)
108109
.jsPlatform(
109-
scalaVersions = scala2 ++ scala3,
110+
scalaVersions = scala2alive ++ scala3,
110111
settings = commonJsSettings ++ browserChromeTestSettings
111112
)
112113
.nativePlatform(
113-
scalaVersions = scala2 ++ scala3,
114+
scalaVersions = scala2alive ++ scala3,
114115
settings = commonNativeSettings
115116
)
116117

@@ -124,11 +125,11 @@ lazy val ws = (projectMatrix in file("ws"))
124125
settings = commonJvmSettings
125126
)
126127
.jsPlatform(
127-
scalaVersions = scala2 ++ scala3,
128+
scalaVersions = scala2alive ++ scala3,
128129
settings = commonJsSettings ++ browserChromeTestSettings
129130
)
130131
.nativePlatform(
131-
scalaVersions = scala2 ++ scala3,
132+
scalaVersions = scala2alive ++ scala3,
132133
settings = commonNativeSettings
133134
)
134135
.dependsOn(core)
@@ -138,7 +139,7 @@ lazy val akka = (projectMatrix in file("akka"))
138139
name := "akka"
139140
)
140141
.jvmPlatform(
141-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
142+
scalaVersions = scala2alive ++ scala3,
142143
settings = commonJvmSettings ++ Seq(
143144
libraryDependencies += "com.typesafe.akka" %% "akka-stream" % "2.6.20" % "provided"
144145
)
@@ -173,25 +174,25 @@ lazy val fs2ce2 = (projectMatrix in file("fs2-ce2"))
173174
)
174175
)
175176
.jsPlatform(
176-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
177+
scalaVersions = scala2alive ++ scala3,
177178
settings = commonJsSettings ++ browserChromeTestSettings
178179
)
179180
.dependsOn(core)
180181

181182
lazy val fs2 = (projectMatrix in file("fs2"))
182183
.settings(name := "fs2", libraryDependencies += "co.fs2" %%% "fs2-core" % fs2_3_version)
183184
.jvmPlatform(
184-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
185+
scalaVersions = scala2alive ++ scala3,
185186
settings = commonJvmSettings ++ Seq(
186187
libraryDependencies += "co.fs2" %% "fs2-io" % fs2_3_version
187188
)
188189
)
189190
.jsPlatform(
190-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
191+
scalaVersions = scala2alive ++ scala3,
191192
settings = commonJsSettings ++ browserChromeTestSettings
192193
)
193194
.nativePlatform(
194-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
195+
scalaVersions = scala2alive ++ scala3,
195196
settings = commonNativeSettings
196197
)
197198
.dependsOn(core)
@@ -202,11 +203,11 @@ lazy val monix = (projectMatrix in file("monix"))
202203
libraryDependencies += "io.monix" %%% "monix" % "3.4.1"
203204
)
204205
.jvmPlatform(
205-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
206+
scalaVersions = scala2alive ++ scala3,
206207
settings = commonJvmSettings
207208
)
208209
.jsPlatform(
209-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
210+
scalaVersions = scala2alive ++ scala3,
210211
settings = commonJsSettings ++ browserChromeTestSettings
211212
)
212213
.dependsOn(core)
@@ -221,7 +222,7 @@ lazy val zio1 = (projectMatrix in file("zio1"))
221222
settings = commonJvmSettings
222223
)
223224
.jsPlatform(
224-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
225+
scalaVersions = scala2alive ++ scala3,
225226
settings = commonJsSettings ++ browserChromeTestSettings
226227
)
227228
.dependsOn(core)
@@ -236,11 +237,11 @@ lazy val zio = (projectMatrix in file("zio"))
236237
settings = commonJvmSettings
237238
)
238239
.jsPlatform(
239-
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
240+
scalaVersions = scala2alive ++ scala3,
240241
settings = commonJsSettings ++ browserChromeTestSettings
241242
)
242243
.nativePlatform(
243-
scalaVersions = scala2 ++ scala3,
244+
scalaVersions = scala2alive ++ scala3,
244245
settings = commonNativeSettings
245246
)
246247
.dependsOn(core)

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.10")
44
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0")
55

66
val sbtSoftwareMillVersion = "2.0.12"

0 commit comments

Comments
 (0)