Skip to content

Commit 6df35fb

Browse files
author
Roman Janusz
authored
Merge pull request #418 from AVSystem/deps-update
ScalaJs 1.10.0, newest Jetty and Mongo driver
2 parents 68d69df + 85712c0 commit 6df35fb

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

commons-core/src/test/scala/com/avsystem/commons/di/MyApp.scala renamed to commons-core/jvm/src/test/scala/com/avsystem/commons/di/MyApp.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,4 @@ package entryPoints {
164164
}
165165
}
166166

167-
}
167+
}

project/Build.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ object Build extends BuildDef {
3838
val collectionCompatVersion = "2.5.0"
3939
val guavaVersion = "30.1.1-jre"
4040
val jsr305Version = "3.0.2"
41-
val scalatestVersion = "3.2.9"
42-
val scalatestplusScalacheckVersion = "3.2.9.0"
43-
val scalacheckVersion = "1.15.4"
44-
val jettyVersion = "9.4.45.v20220203"
45-
val mongoVersion = "4.5.0"
41+
val scalatestVersion = "3.2.12"
42+
val scalatestplusScalacheckVersion = "3.2.12.0"
43+
val scalacheckVersion = "1.16.0"
44+
val jettyVersion = "9.4.46.v20220331"
45+
val mongoVersion = "4.6.0"
4646
val springVersion = "4.3.26.RELEASE"
4747
val typesafeConfigVersion = "1.4.2"
4848
val commonsIoVersion = "1.3.2" // test only
4949
val scalaLoggingVersion = "3.9.4"
5050
val akkaVersion = "2.6.14"
51-
val monixVersion = "3.4.0"
51+
val monixVersion = "3.4.1"
5252
val mockitoVersion = "3.9.0"
5353
val circeVersion = "0.13.0" // benchmark only
5454
val upickleVersion = "1.3.11" // benchmark only
@@ -171,7 +171,7 @@ object Build extends BuildDef {
171171
libraryDependencies ++= Seq(
172172
"org.scalatest" %%% "scalatest" % scalatestVersion % Test,
173173
"org.scalacheck" %%% "scalacheck" % scalacheckVersion % Test,
174-
"org.scalatestplus" %%% "scalacheck-1-15" % scalatestplusScalacheckVersion % Test,
174+
"org.scalatestplus" %%% "scalacheck-1-16" % scalatestplusScalacheckVersion % Test,
175175
"org.mockito" % "mockito-core" % mockitoVersion % Test,
176176
),
177177
ideBasePackages := Seq(organization.value),

project/project/BuildBuild.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import sbt._
33

44
object BuildBuild extends AutoPlugin {
55
val scalaJSVersion: String =
6-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.7.1")
6+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.10.0")
77

88
override def extraProjects: Seq[Project] = Seq(macros)
99

@@ -19,7 +19,7 @@ object BuildBuild extends AutoPlugin {
1919
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7"),
2020
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3"),
2121
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2"),
22-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.0"),
22+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.2"),
2323
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.8"),
2424
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.9.5"),
2525
)

0 commit comments

Comments
 (0)