Skip to content

Commit

Permalink
Merge pull request #29 from ScorexFoundation/upgrade-scala-js
Browse files Browse the repository at this point in the history
Upgrade libraries
  • Loading branch information
aslesarenko authored Jul 4, 2023
2 parents 5e99fe8 + 8536c43 commit 51ce5b0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.8, 2.12.15, 2.11.12]
scala: [2.13.11, 2.12.18, 2.11.12]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.8, 2.12.15]
scala: [2.13.11]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ lazy val scalac213: Seq[String] = Seq(
)


lazy val scala213 = "2.13.8"
lazy val scala212 = "2.12.15"
lazy val scala213 = "2.13.11"
lazy val scala212 = "2.12.18"
lazy val scala211 = "2.11.12"

crossScalaVersions := Seq(scala211, scala212, scala213)
Expand Down Expand Up @@ -171,7 +171,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
)
.jsSettings(
scalaVersion := scala213,
crossScalaVersions := Seq(scala212, scala213),
crossScalaVersions := Seq(scala213),
libraryDependencies ++= Seq(
),
Test / parallelExecution := false
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.4
sbt.version=1.9.1
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")

0 comments on commit 51ce5b0

Please sign in to comment.