diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..c4137bd --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.4 +3d07c07dcf7d1016cdf890867f6edc3522b02566 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8034831..31d7a5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,24 +24,23 @@ concurrency: jobs: build: - name: Build and Test + name: Test strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] scala: [2.13, 3, 2.12] java: [temurin@17] runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: - - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' @@ -59,22 +58,22 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: Check scalafix lints - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt '++ ${{ matrix.scala }}' 'scalafixAll --check' - name: Test run: sbt '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt '++ ${{ matrix.scala }}' doc - name: Make target directories @@ -98,19 +97,18 @@ jobs: if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [temurin@17] runs-on: ${{ matrix.os }} steps: - - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' @@ -183,19 +181,18 @@ jobs: if: github.event.repository.fork == false && github.event_name != 'pull_request' strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [temurin@17] runs-on: ${{ matrix.os }} steps: - - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' @@ -219,19 +216,18 @@ jobs: name: Generate Site strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [temurin@17] runs-on: ${{ matrix.os }} steps: - - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' diff --git a/.mergify.yml b/.mergify.yml index dc2f29d..0dc21ca 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,9 +10,9 @@ pull_request_rules: conditions: - author=etspaceman-scala-steward-app[bot] - body~=labels:.*early-semver-patch - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17) - - status-success=Build and Test (ubuntu-latest, 3, temurin@17) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@17) + - status-success=Test (ubuntu-22.04, 2.13, temurin@17) + - status-success=Test (ubuntu-22.04, 3, temurin@17) + - status-success=Test (ubuntu-22.04, 2.12, temurin@17) actions: merge: method: squash diff --git a/.scalafmt.conf b/.scalafmt.conf index d9b1f21..eb5a9a8 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.5 project.git = true runner.dialect = scala213Source3 diff --git a/build.sbt b/build.sbt index 0faefc7..bb0d202 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import laika.helium.config.TextLink import laika.helium.config.ThemeNavigationSection val Scala212 = "2.12.20" -val Scala213 = "2.13.15" +val Scala213 = "2.13.16" val Scala3 = "3.3.4" val allScalaVersions = List(Scala213, Scala3, Scala212) @@ -74,9 +74,8 @@ lazy val `scalacheck-faker` = project ), Test / fork := true, tlJdkRelease := Some(8), - Test / testOptions ++= { - List(Tests.Argument(TestFrameworks.MUnit, "+l")) - }, + Test / testOptions ++= + List(Tests.Argument(TestFrameworks.MUnit, "+l")), scalacOptions ++= { if (scalaVersion.value.startsWith("2.13")) Seq("-Xlint:-byname-implicit") else Nil diff --git a/project/LibraryDependencies.scala b/project/LibraryDependencies.scala index be3cf0b..ca7bf2d 100644 --- a/project/LibraryDependencies.scala +++ b/project/LibraryDependencies.scala @@ -5,7 +5,7 @@ object LibraryDependencies { val TypesafeConfig = "com.typesafe" % "config" % "1.4.3" val ApacheCommons = "org.apache.commons" % "commons-lang3" % "3.17.0" val KindProjector = "org.typelevel" % "kind-projector" % "0.13.3" - val PureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.7" + val PureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.8" val ScalaParsingCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0" diff --git a/project/build.properties b/project/build.properties index 25ff9a6..0882e8a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.6 \ No newline at end of file +sbt.version = 1.10.7 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index d6902b9..01e7866 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.3") -addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.3") -addSbtPlugin("org.typelevel" % "sbt-typelevel-mima" % "0.7.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.6") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.6") +addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.6") +addSbtPlugin("org.typelevel" % "sbt-typelevel-mima" % "0.7.6")