Skip to content

Commit 8e7c6f6

Browse files
authored
Merge pull request #1286 from UdashFramework/update/scala-2.13.15,commons,analyzer,scalajs
Update scala 2.13.15, avs-common 2.20.0, analyzer 2.20.0, scalajs 1.17.0, sttp 3.10.0
2 parents 6d16f84 + 05922a3 commit 8e7c6f6

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
scala: [ 2.13.14 ]
21+
scala: [ 2.13.15 ]
2222
command: [ udash-jvm/test, udash-js/test, guide-selenium/test ]
2323
steps:
2424
- uses: actions/checkout@v4

project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import sbt.*
55
import sbt.Keys.scalaVersion
66

77
object Dependencies {
8-
val versionOfScala = "2.13.14" //update .github/workflows/ci.yml as well
8+
val versionOfScala = "2.13.15" //update .github/workflows/ci.yml as well
99

1010
val jqueryWrapperVersion = "3.3.0"
1111

@@ -14,7 +14,7 @@ object Dependencies {
1414
val scalaCssVersion = "1.0.0"
1515

1616
val servletVersion = "4.0.1"
17-
val avsCommonsVersion = "2.19.0"
17+
val avsCommonsVersion = "2.20.0"
1818

1919
val atmosphereJSVersion = "3.1.3"
2020
val atmosphereVersion = "2.7.14"
@@ -24,7 +24,7 @@ object Dependencies {
2424
val circeDerivationVersion = "0.13.0-M5" // Tests only
2525
val monixVersion = "3.4.1" // udash-rest only
2626

27-
val sttpVersion = "3.9.8"
27+
val sttpVersion = "3.10.0"
2828

2929
val scalaLoggingVersion = "3.9.5"
3030

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ logLevel := Level.Warn
33
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
44
libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"
55

6-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
6+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
77
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
88
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
99
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2")

rpc/src/test/scala/io/udash/rpc/TestRPC.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ trait RPCMethodsImpl extends RPCMethods {
108108
onFire("handleMore", List(Nil))
109109

110110
override def doStuff(lol: Int, fuu: String)(cos: Option[Boolean]): Unit =
111-
onFire("doStuff", List(List(lol, fuu), List(cos)))
111+
onFire("doStuff", List(List[Any](lol, fuu), List(cos)))
112112

113113
override def doStuff(num: Int): Unit =
114114
onFire("doStuffInt", List(List(num)))

0 commit comments

Comments
 (0)