Skip to content

Commit 1654353

Browse files
authored
Merge branch 'sbt:main' into root-component-metadata
2 parents f2a90c3 + 9f229d7 commit 1654353

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,29 @@ jobs:
4444
disk-root: 'C:'
4545

4646
- name: Checkout current branch (full)
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848
with:
4949
fetch-depth: 0
5050

5151
- name: Setup Java (temurin@8)
5252
if: matrix.java == 'temurin@8'
53-
uses: actions/setup-java@v4
53+
uses: actions/setup-java@v5
5454
with:
5555
distribution: temurin
5656
java-version: 8
5757
cache: sbt
5858

5959
- name: Setup Java (temurin@11)
6060
if: matrix.java == 'temurin@11'
61-
uses: actions/setup-java@v4
61+
uses: actions/setup-java@v5
6262
with:
6363
distribution: temurin
6464
java-version: 11
6565
cache: sbt
6666

6767
- name: Setup Java (temurin@17)
6868
if: matrix.java == 'temurin@17'
69-
uses: actions/setup-java@v4
69+
uses: actions/setup-java@v5
7070
with:
7171
distribution: temurin
7272
java-version: 17
@@ -120,29 +120,29 @@ jobs:
120120
disk-root: 'C:'
121121

122122
- name: Checkout current branch (full)
123-
uses: actions/checkout@v4
123+
uses: actions/checkout@v5
124124
with:
125125
fetch-depth: 0
126126

127127
- name: Setup Java (temurin@8)
128128
if: matrix.java == 'temurin@8'
129-
uses: actions/setup-java@v4
129+
uses: actions/setup-java@v5
130130
with:
131131
distribution: temurin
132132
java-version: 8
133133
cache: sbt
134134

135135
- name: Setup Java (temurin@11)
136136
if: matrix.java == 'temurin@11'
137-
uses: actions/setup-java@v4
137+
uses: actions/setup-java@v5
138138
with:
139139
distribution: temurin
140140
java-version: 11
141141
cache: sbt
142142

143143
- name: Setup Java (temurin@17)
144144
if: matrix.java == 'temurin@17'
145-
uses: actions/setup-java@v4
145+
uses: actions/setup-java@v5
146146
with:
147147
distribution: temurin
148148
java-version: 17

.github/workflows/clean.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ name: Clean
99

1010
on: push
1111

12+
permissions:
13+
actions: write
14+
1215
jobs:
1316
delete-artifacts:
1417
name: Delete Artifacts

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ object Dependencies {
1010
"io.circe" %% "circe-parser" % "0.14.14",
1111
"org.cyclonedx" % "cyclonedx-core-java" % "10.2.1",
1212
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
13-
"org.scalamock" %% "scalamock" % "7.4.0" % Test
13+
"org.scalamock" %% "scalamock" % "7.4.1" % Test
1414
)
1515
}

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")
66
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
7-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1")
8-
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.25.0")
7+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
8+
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.27.0")
99
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3")

0 commit comments

Comments
 (0)