Skip to content

Commit 0741d24

Browse files
author
Roman Janusz
authored
Merge pull request #415 from AVSystem/deps-update
Scala 2.13.8; bump jetty to 9.4.45.v20220203
2 parents 3cad3bc + 5ca525c commit 0741d24

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
matrix:
2626
os: [ubuntu-latest]
27-
scala: [2.13.7, 2.12.15]
27+
scala: [2.13.8, 2.12.15]
2828
2929
runs-on: ${{ matrix.os }}
3030
steps:
@@ -91,7 +91,7 @@ jobs:
9191
strategy:
9292
matrix:
9393
os: [ubuntu-latest]
94-
scala: [2.13.7]
94+
scala: [2.13.8]
9595
9696
runs-on: ${{ matrix.os }}
9797
steps:
@@ -117,12 +117,12 @@ jobs:
117117
~/Library/Caches/Coursier/v1
118118
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
119119

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

125-
- name: Inflate target directories (2.13.7)
125+
- name: Inflate target directories (2.13.8)
126126
run: |
127127
tar xf targets.tar
128128
rm targets.tar

build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ val jsr305Version = "3.0.2"
1414
val scalatestVersion = "3.2.9"
1515
val scalatestplusScalacheckVersion = "3.2.9.0"
1616
val scalacheckVersion = "1.15.4"
17-
val jettyVersion = "9.4.44.v20210927"
17+
val jettyVersion = "9.4.45.v20220203"
1818
val mongoVersion = "4.5.0"
1919
val springVersion = "4.3.26.RELEASE"
20-
val typesafeConfigVersion = "1.4.1"
20+
val typesafeConfigVersion = "1.4.2"
2121
val commonsIoVersion = "1.3.2" // test only
2222
val scalaLoggingVersion = "3.9.4"
2323
val akkaVersion = "2.6.14"
@@ -26,7 +26,7 @@ val mockitoVersion = "3.9.0"
2626
val circeVersion = "0.13.0" // benchmark only
2727
val upickleVersion = "1.3.11" // benchmark only
2828
val scalajsBenchmarkVersion = "0.9.0"
29-
val slf4jVersion = "1.7.30"
29+
val slf4jVersion = "1.7.32"
3030

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

55-
crossScalaVersions := Seq("2.13.7", "2.12.15"),
55+
crossScalaVersions := Seq("2.13.8", "2.12.15"),
5656
scalaVersion := crossScalaVersions.value.head,
5757
compileOrder := CompileOrder.Mixed,
5858

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# suppress inspection "UnusedProperty"
2-
sbt.version=1.5.7
2+
sbt.version=1.6.2

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
logLevel := Level.Warn
22

33
val scalaJSVersion =
4-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.5.1")
4+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.7.1")
55

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

0 commit comments

Comments
 (0)