diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cc13a2..397d01d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -54,7 +54,7 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@17' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck lucumaScalafmtCheck lucumaScalafixCheck - name: Check scalafix lints @@ -68,4 +68,4 @@ jobs: run: sbt '++ ${{ matrix.scala }}' coverageReport coverageAggregate - name: Upload code coverage data - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 diff --git a/.scalafix-common.conf b/.scalafix-common.conf index 5d349c3..e38e6ca 100644 --- a/.scalafix-common.conf +++ b/.scalafix-common.conf @@ -7,3 +7,4 @@ rules = [ OrganizeImports ] +OrganizeImports.targetDialect = Auto diff --git a/.scalafmt-common.conf b/.scalafmt-common.conf index 3cb97af..0d8610d 100644 --- a/.scalafmt-common.conf +++ b/.scalafmt-common.conf @@ -4,7 +4,7 @@ # this file by hand! Instead, if you wish to make changes, you should # make a PR to sbt-lucuma. -version = "3.7.14" +version = "3.8.0" style = default runner.dialect = scala3 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7541cce..8c62608 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("edu.gemini" % "sbt-lucuma" % "0.11.9") +addSbtPlugin("edu.gemini" % "sbt-lucuma" % "0.11.15") addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") // sbt revolver lets launching applications from the sbt console