From f64a77dbb31312ff2f237a04d169396e90aacaa0 Mon Sep 17 00:00:00 2001 From: "dwolla-oss-scala-steward[bot]" <212073+dwolla-oss-scala-steward[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 20:06:20 +0000 Subject: [PATCH 1/3] Update sbt-typelevel-ci-release, ... to 0.7.1 --- project/plugins.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0302dab..0c0c18f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,10 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.5.4") -addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.5.4") -addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.4") -addSbtPlugin("org.typelevel" % "sbt-typelevel-no-publish" % "0.5.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.7.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel-no-publish" % "0.7.1") addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta43") From c451600e41dd7abcf51b395fd380b86e476dd16e Mon Sep 17 00:00:00 2001 From: Brian Holt Date: Fri, 7 Jun 2024 15:39:42 -0500 Subject: [PATCH 2/3] Update mergifyStewardConfig to use the new API --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 366617c..401945a 100644 --- a/build.sbt +++ b/build.sbt @@ -25,10 +25,10 @@ ThisBuild / tlMimaPreviousVersions ++= { ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "mimaReportBinaryIssues", "doc"))) ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"), JavaSpec.temurin("11")) ThisBuild / mergifyRequiredJobs ++= Seq("validate-steward") -ThisBuild / mergifyStewardConfig ~= { _.map(_.copy( - author = "dwolla-oss-scala-steward[bot]", - mergeMinors = true, -))} +ThisBuild / mergifyStewardConfig ~= { _.map { + _.withAuthor("dwolla-oss-scala-steward[bot]") + .withMergeMinors(true) +}} lazy val `fs2-utils` = crossProject(JSPlatform, JVMPlatform) .crossType(CrossType.Full) From 0f658efa0cf57a9595014814ac2eb611890484a3 Mon Sep 17 00:00:00 2001 From: Brian Holt Date: Fri, 7 Jun 2024 15:42:15 -0500 Subject: [PATCH 3/3] run githubWorkflowGenerate --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bcafe4..2b19426 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -54,7 +54,7 @@ jobs: - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -79,7 +79,7 @@ jobs: - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/3.x') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }} path: targets.tar @@ -102,7 +102,7 @@ jobs: - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -115,7 +115,7 @@ jobs: - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -126,7 +126,7 @@ jobs: run: sbt +update - name: Download target directories (3) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3 @@ -136,7 +136,7 @@ jobs: rm targets.tar - name: Download target directories (2.13) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13 @@ -146,7 +146,7 @@ jobs: rm targets.tar - name: Download target directories (2.12) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.12 @@ -196,7 +196,7 @@ jobs: - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -209,7 +209,7 @@ jobs: - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11