Skip to content

Commit

Permalink
Merge branch 'master' into lazy-rx
Browse files Browse the repository at this point in the history
  • Loading branch information
cornerman authored Nov 6, 2023
2 parents c8f667b + 6be407d commit a891bf0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
build:
strategy:
matrix:
scalaVersion: ["2.13.11", "3.3.0"]
scalaVersion: ["2.13.11", "3.3.1"]
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: coursier/cache-action@v6
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
runner.dialect = scala213
version = "3.7.12"
version = "3.7.15"
maxColumn = 140
trailingCommas = always
align.preset = most
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ inThisBuild(
)

lazy val commonSettings = Seq(
crossScalaVersions := Seq("2.13.11", "3.3.0"),
crossScalaVersions := Seq("2.13.11", "3.3.1"),
scalaVersion := "2.13.11",
libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq.empty
Expand All @@ -38,7 +38,7 @@ lazy val commonSettings = Seq(
)
}),
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % "3.2.15" % Test,
"org.scalatest" %%% "scalatest" % "3.2.17" % Test,
),
/* scalacOptions --= Seq("-Xfatal-warnings"), // overwrite option from https://github.com/DavidGregory084/sbt-tpolecat */
)
Expand Down Expand Up @@ -76,7 +76,7 @@ lazy val jsdom = project
.settings(
name := "colibri-jsdom",
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "2.6.0",
"org.scala-js" %%% "scalajs-dom" % "2.8.0",
),
)

Expand Down Expand Up @@ -150,6 +150,6 @@ lazy val fs2 = project
.settings(
name := "colibri-fs2",
libraryDependencies ++= Seq(
"co.fs2" %%% "fs2-core" % "3.8.0",
"co.fs2" %%% "fs2-core" % "3.9.2",
),
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.9.3
sbt.version = 1.9.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")

addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")

Expand Down

0 comments on commit a891bf0

Please sign in to comment.