Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.7, 2.12.15]
scala: [2.13.8, 2.12.15]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.7]
scala: [2.13.8]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -117,12 +117,12 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.7)
- name: Download target directories (2.13.8)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}

- name: Inflate target directories (2.13.7)
- name: Inflate target directories (2.13.8)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ val jsr305Version = "3.0.2"
val scalatestVersion = "3.2.9"
val scalatestplusScalacheckVersion = "3.2.9.0"
val scalacheckVersion = "1.15.4"
val jettyVersion = "9.4.44.v20210927"
val jettyVersion = "9.4.45.v20220203"
val mongoVersion = "4.5.0"
val springVersion = "4.3.26.RELEASE"
val typesafeConfigVersion = "1.4.1"
val typesafeConfigVersion = "1.4.2"
val commonsIoVersion = "1.3.2" // test only
val scalaLoggingVersion = "3.9.4"
val akkaVersion = "2.6.14"
Expand All @@ -26,7 +26,7 @@ val mockitoVersion = "3.9.0"
val circeVersion = "0.13.0" // benchmark only
val upickleVersion = "1.3.11" // benchmark only
val scalajsBenchmarkVersion = "0.9.0"
val slf4jVersion = "1.7.30"
val slf4jVersion = "1.7.32"

// for binary compatibility checking
val previousCompatibleVersions = Set("2.2.4")
Expand All @@ -52,7 +52,7 @@ inThisBuild(Seq(
Developer("ghik", "Roman Janusz", "[email protected]", url("https://github.com/ghik")),
),

crossScalaVersions := Seq("2.13.7", "2.12.15"),
crossScalaVersions := Seq("2.13.8", "2.12.15"),
scalaVersion := crossScalaVersions.value.head,
compileOrder := CompileOrder.Mixed,

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# suppress inspection "UnusedProperty"
sbt.version=1.5.7
sbt.version=1.6.2
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
logLevel := Level.Warn

val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.5.1")
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.7.1")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
Expand Down