Skip to content

Commit eeb4bfa

Browse files
authored
Merge pull request #4665 from typelevel/update/sbt-typelevel-0.7.4
Update sbt-typelevel, sbt-typelevel-site to 0.7.4
2 parents 478e1a4 + 92dd62e commit eeb4bfa

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ jobs:
5252
timeout-minutes: 60
5353
steps:
5454
- name: Install sbt
55-
if: contains(runner.os, 'macos')
56-
run: brew install sbt
55+
uses: sbt/setup-sbt@v1
5756

5857
- name: Checkout current branch (full)
5958
uses: actions/checkout@v4
@@ -89,7 +88,7 @@ jobs:
8988
- name: Setup Java (graalvm@17)
9089
id: setup-java-graalvm-17
9190
if: matrix.java == 'graalvm@17'
92-
uses: graalvm/setup-graalvm@v1
91+
uses: actions/setup-java@v4
9392
with:
9493
distribution: graalvm
9594
java-version: 17
@@ -151,8 +150,7 @@ jobs:
151150
runs-on: ${{ matrix.os }}
152151
steps:
153152
- name: Install sbt
154-
if: contains(runner.os, 'macos')
155-
run: brew install sbt
153+
uses: sbt/setup-sbt@v1
156154

157155
- name: Checkout current branch (full)
158156
uses: actions/checkout@v4
@@ -188,7 +186,7 @@ jobs:
188186
- name: Setup Java (graalvm@17)
189187
id: setup-java-graalvm-17
190188
if: matrix.java == 'graalvm@17'
191-
uses: graalvm/setup-graalvm@v1
189+
uses: actions/setup-java@v4
192190
with:
193191
distribution: graalvm
194192
java-version: 17
@@ -322,8 +320,7 @@ jobs:
322320
runs-on: ${{ matrix.os }}
323321
steps:
324322
- name: Install sbt
325-
if: contains(runner.os, 'macos')
326-
run: brew install sbt
323+
uses: sbt/setup-sbt@v1
327324

328325
- name: Checkout current branch (full)
329326
uses: actions/checkout@v4
@@ -359,7 +356,7 @@ jobs:
359356
- name: Setup Java (graalvm@17)
360357
id: setup-java-graalvm-17
361358
if: matrix.java == 'graalvm@17'
362-
uses: graalvm/setup-graalvm@v1
359+
uses: actions/setup-java@v4
363360
with:
364361
distribution: graalvm
365362
java-version: 17
@@ -409,8 +406,7 @@ jobs:
409406
runs-on: ${{ matrix.os }}
410407
steps:
411408
- name: Install sbt
412-
if: contains(runner.os, 'macos')
413-
run: brew install sbt
409+
uses: sbt/setup-sbt@v1
414410

415411
- name: Checkout current branch (full)
416412
uses: actions/checkout@v4
@@ -446,7 +442,7 @@ jobs:
446442
- name: Setup Java (graalvm@17)
447443
id: setup-java-graalvm-17
448444
if: matrix.java == 'graalvm@17'
449-
uses: graalvm/setup-graalvm@v1
445+
uses: actions/setup-java@v4
450446
with:
451447
distribution: graalvm
452448
java-version: 17
@@ -476,8 +472,7 @@ jobs:
476472
runs-on: ${{ matrix.os }}
477473
steps:
478474
- name: Install sbt
479-
if: contains(runner.os, 'macos')
480-
run: brew install sbt
475+
uses: sbt/setup-sbt@v1
481476

482477
- name: Checkout current branch (full)
483478
uses: actions/checkout@v4
@@ -513,7 +508,7 @@ jobs:
513508
- name: Setup Java (graalvm@17)
514509
id: setup-java-graalvm-17
515510
if: matrix.java == 'graalvm@17'
516-
uses: graalvm/setup-graalvm@v1
511+
uses: actions/setup-java@v4
517512
with:
518513
distribution: graalvm
519514
java-version: 17

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val sbtTypelevelVersion = "0.7.3"
1+
val sbtTypelevelVersion = "0.7.4"
22
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
33
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
44
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")

0 commit comments

Comments
 (0)