Skip to content

Commit 6548d29

Browse files
authored
Merge pull request scala#11118 from lrytz/merge-212
Merge 2.12.x to 2.13.x
2 parents d66a09d + 8cfea61 commit 6548d29

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
steps:
2525
- run: git config --global core.autocrlf false
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828

2929
- name: Setup Java
30-
uses: actions/setup-java@v4
30+
uses: actions/setup-java@v5
3131
with:
3232
distribution: temurin
3333
java-version: ${{matrix.java}}

.github/workflows/validate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
validate:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
10-
- uses: actions/setup-java@v4
9+
- uses: actions/checkout@v5
10+
- uses: actions/setup-java@v5
1111
with:
1212
distribution: temurin
1313
java-version: 8

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
2626

2727
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
2828

29-
addSbtPlugin("com.gradle" % "sbt-develocity" % "1.2.1")
29+
addSbtPlugin("com.gradle" % "sbt-develocity" % "1.3.1")

0 commit comments

Comments
 (0)