diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d35b0c..920a8e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12] + scala: [2.12, 3] java: [temurin@8] runs-on: ${{ matrix.os }} timeout-minutes: 60 @@ -130,6 +130,16 @@ jobs: tar xf targets.tar rm targets.tar + - name: Download target directories (3) + uses: actions/download-artifact@v4 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-3 + + - name: Inflate target directories (3) + run: | + tar xf targets.tar + rm targets.tar + - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' env: @@ -188,7 +198,7 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: sbt-tpolecat_2.12 + modules-ignore: sbt-tpolecat_2.12 sbt-tpolecat_3 configs-ignore: test scala-tool scala-doc-tool test-internal validate-steward: diff --git a/build.sbt b/build.sbt index 522b975..58a4249 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ ThisBuild / semanticdbVersion := scalafixSemanticdb.revision ThisBuild / versionScheme := Some(VersionScheme.EarlySemVer) -ThisBuild / scalaVersion := "2.12.19" +ThisBuild / crossScalaVersions := Seq("2.12.19", "3.3.4") lazy val `sbt-tpolecat` = project .in(file(".")) @@ -55,14 +55,16 @@ lazy val `sbt-tpolecat-plugin` = project test := { (Test / test).value scripted.toTask("").value - } + }, + sbtVersion := { if (scalaVersion.value.startsWith("3.")) "2.0.0-M2" else "1.10.2" } ) lazy val `sbt-tpolecat-scalafix` = scalafixProject("sbt-tpolecat") .rulesConfigure(project => project.settings( mimaPreviousArtifacts := Set( - ) + ), + crossScalaVersions := Seq("2.12.19") ) ) .inputSettings(addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.0")) diff --git a/plugin/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala b/plugin/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala index 7c1760a..dc1324b 100644 --- a/plugin/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala +++ b/plugin/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala @@ -17,7 +17,7 @@ package org.typelevel.sbt.tpolecat import sbt.Keys._ -import sbt.{ScalaVersion => _, _} +import sbt.{ScalaVersion => _, given, _} import scala.util.Try import org.typelevel.scalacoptions._