Skip to content

Commit ff0be9b

Browse files
authored
Merge branch 'main' into update/scala-library-2.13.17
2 parents bbfcce7 + 7dc8cb7 commit ff0be9b

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
timeout-minutes: 60
3636
steps:
3737
- name: Checkout current branch (full)
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v5
3939
with:
4040
fetch-depth: 0
4141

@@ -45,7 +45,7 @@ jobs:
4545
- name: Setup Java (temurin@8)
4646
id: setup-java-temurin-8
4747
if: matrix.java == 'temurin@8'
48-
uses: actions/setup-java@v4
48+
uses: actions/setup-java@v5
4949
with:
5050
distribution: temurin
5151
java-version: 8
@@ -107,7 +107,7 @@ jobs:
107107
runs-on: ${{ matrix.os }}
108108
steps:
109109
- name: Checkout current branch (full)
110-
uses: actions/checkout@v4
110+
uses: actions/checkout@v5
111111
with:
112112
fetch-depth: 0
113113

@@ -117,7 +117,7 @@ jobs:
117117
- name: Setup Java (temurin@8)
118118
id: setup-java-temurin-8
119119
if: matrix.java == 'temurin@8'
120-
uses: actions/setup-java@v4
120+
uses: actions/setup-java@v5
121121
with:
122122
distribution: temurin
123123
java-version: 8
@@ -251,7 +251,7 @@ jobs:
251251
runs-on: ${{ matrix.os }}
252252
steps:
253253
- name: Checkout current branch (full)
254-
uses: actions/checkout@v4
254+
uses: actions/checkout@v5
255255
with:
256256
fetch-depth: 0
257257

@@ -261,7 +261,7 @@ jobs:
261261
- name: Setup Java (temurin@8)
262262
id: setup-java-temurin-8
263263
if: matrix.java == 'temurin@8'
264-
uses: actions/setup-java@v4
264+
uses: actions/setup-java@v5
265265
with:
266266
distribution: temurin
267267
java-version: 8
@@ -286,12 +286,12 @@ jobs:
286286
runs-on: ${{ matrix.os }}
287287
steps:
288288
- name: Checkout current branch (fast)
289-
uses: actions/checkout@v4
289+
uses: actions/checkout@v5
290290

291291
- name: Setup Java (temurin@8)
292292
id: setup-java-temurin-8
293293
if: matrix.java == 'temurin@8'
294-
uses: actions/setup-java@v4
294+
uses: actions/setup-java@v5
295295
with:
296296
distribution: temurin
297297
java-version: 8
@@ -314,7 +314,7 @@ jobs:
314314
runs-on: ${{ matrix.os }}
315315
steps:
316316
- name: Checkout current branch (full)
317-
uses: actions/checkout@v4
317+
uses: actions/checkout@v5
318318
with:
319319
fetch-depth: 0
320320

@@ -324,7 +324,7 @@ jobs:
324324
- name: Setup Java (temurin@8)
325325
id: setup-java-temurin-8
326326
if: matrix.java == 'temurin@8'
327-
uses: actions/setup-java@v4
327+
uses: actions/setup-java@v5
328328
with:
329329
distribution: temurin
330330
java-version: 8
@@ -337,7 +337,7 @@ jobs:
337337
- name: Setup Java (temurin@11)
338338
id: setup-java-temurin-11
339339
if: matrix.java == 'temurin@11'
340-
uses: actions/setup-java@v4
340+
uses: actions/setup-java@v5
341341
with:
342342
distribution: temurin
343343
java-version: 11

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.6
1+
sbt.version=1.11.7

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
22
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
44
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1")
5-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
6-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.0")
7-
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.0")
5+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
6+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.2")
7+
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.2")

0 commit comments

Comments
 (0)