Skip to content

Commit 0a505fa

Browse files
authored
Merge pull request #3437 from scala-steward/update/sbt-typelevel-mergify-0.7.4
Update sbt-typelevel-mergify to 0.7.4
2 parents d7ca234 + 7cdcb87 commit 0a505fa

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ jobs:
3434
timeout-minutes: 60
3535
steps:
3636
- name: Install sbt
37-
if: contains(runner.os, 'macos')
38-
run: brew install sbt
37+
uses: sbt/setup-sbt@v1
3938

4039
- name: Checkout current branch (full)
4140
uses: actions/checkout@v4
@@ -120,8 +119,7 @@ jobs:
120119
runs-on: ${{ matrix.os }}
121120
steps:
122121
- name: Install sbt
123-
if: contains(runner.os, 'macos')
124-
run: brew install sbt
122+
uses: sbt/setup-sbt@v1
125123

126124
- name: Checkout current branch (full)
127125
uses: actions/checkout@v4

modules/core/src/test/scala/org/scalasteward/core/update/artifact/ArtifactMigrationsFinderTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class ArtifactMigrationsFinderTest extends FunSuite {
151151
test("migrateDependency: sbt-dynver with migration") {
152152
val dependency = ("com.dwijnand".g % "sbt-dynver".a % "4.1.1")
153153
.copy(sbtVersion = Some(SbtVersion("1.0")), scalaVersion = Some(ScalaVersion("2.12")))
154-
val expected = (dependency %> Nel.of("5.0.1")).single
154+
val expected = (dependency %> Nel.of("5.1.0")).single
155155
.copy(newerGroupId = Some("com.github.sbt".g), newerArtifactId = Some("sbt-dynver"))
156156
val obtained = updateAlg
157157
.findUpdates(

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
1111
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
1212
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1")
1313
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1")
14-
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.3")
14+
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.4")
1515

1616
ThisBuild / evictionErrorLevel := Level.Info

0 commit comments

Comments
 (0)