Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ name: Continuous Integration

on:
pull_request:
branches: ['**']
branches: ['**', '!update/**', '!pr/**']
push:
branches: ['**']
branches: ['**', '!update/**', '!pr/**']
tags: [v*]

env:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Check that workflows are up to date
run: sbt '++${{ matrix.scala }}' 'project /' githubWorkflowCheck
run: sbt githubWorkflowCheck

- run: sbt '++${{ matrix.scala }}' clean coverage test mimaReportBinaryIssues scalastyle scalafmtCheckAll scalafmtSbtCheck unidoc coverageReport

Expand Down
21 changes: 14 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ val finagleVersion = "22.4.0"
ThisBuild / tlBaseVersion := BaseVersion(finagleVersion)
ThisBuild / tlVersionIntroduced := // test bincompat starting from the beginning of this series
List("2.12", "2.13").map(_ -> s"${tlBaseVersion.value}.0").toMap
ThisBuild / tlCiHeaderCheck := false

// For the transition period, we publish artifacts for both cats-effect 2.x and 3.x
val catsEffectVersion = "2.5.5"
Expand Down Expand Up @@ -38,9 +39,12 @@ lazy val baseSettings = Seq(
"org.typelevel" %% "discipline-core" % "1.5.1" % Test,
"org.typelevel" %% "discipline-scalatest" % "2.2.0" % Test
),
resolvers += Resolver.sonatypeRepo("snapshots"),
resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
docMappingsApiDir := "api",
autoAPIMappings := true
autoAPIMappings := true,

// disable automatic copyright header creation otherwise added via sbt-typelevel
headerMappings := Map.empty
)

lazy val allSettings = baseSettings
Expand Down Expand Up @@ -159,12 +163,14 @@ ThisBuild / githubWorkflowBuild := Seq(
)
)

lazy val `scalafix-rules` = (project in file("scalafix/rules")).settings(
moduleName := "catbird-scalafix",
libraryDependencies ++= Seq(
"ch.epfl.scala" %% "scalafix-core" % _root_.scalafix.sbt.BuildInfo.scalafixVersion
lazy val `scalafix-rules` = (project in file("scalafix/rules"))
.settings(allSettings)
.settings(
moduleName := "catbird-scalafix",
libraryDependencies ++= Seq(
"ch.epfl.scala" %% "scalafix-core" % _root_.scalafix.sbt.BuildInfo.scalafixVersion
)
)
)

lazy val `scalafix-input` = (project in file("scalafix/input"))
.settings(
Expand All @@ -186,6 +192,7 @@ lazy val `scalafix-output` = (project in file("scalafix/output"))
.enablePlugins(NoPublishPlugin)

lazy val `scalafix-tests` = (project in file("scalafix/tests"))
.settings(allSettings)
.settings(
libraryDependencies += {
import _root_.scalafix.sbt.BuildInfo.scalafixVersion
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.9")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.16")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.0")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.typelevel.catbird.scalafix

import scalafix.testkit._
import org.scalatest.FunSuiteLike
import org.scalatest.funsuite.AnyFunSuiteLike

class RuleSuite extends AbstractSemanticRuleSuite with FunSuiteLike {
class RuleSuite extends AbstractSemanticRuleSuite with AnyFunSuiteLike {
runAllTests()
}