From 14a7a50ee55a23db6a6734664581bca2f7ea8341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Sat, 5 Oct 2024 16:02:30 +0200 Subject: [PATCH 1/3] POC: support sbt 2 --- build.sbt | 6 +++--- .../scala/io/github/davidgregory084/TpolecatPlugin.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 522b975..910328f 100644 --- a/build.sbt +++ b/build.sbt @@ -17,8 +17,6 @@ ThisBuild / semanticdbVersion := scalafixSemanticdb.revision ThisBuild / versionScheme := Some(VersionScheme.EarlySemVer) -ThisBuild / scalaVersion := "2.12.19" - lazy val `sbt-tpolecat` = project .in(file(".")) .enablePlugins(NoPublishPlugin) @@ -55,7 +53,9 @@ lazy val `sbt-tpolecat-plugin` = project test := { (Test / test).value scripted.toTask("").value - } + }, + crossScalaVersions := Seq("2.12.20", "3.3.4"), + sbtVersion := { if (scalaVersion.value.startsWith("3.")) "2.0.0-M2" else "1.10.2" } ) lazy val `sbt-tpolecat-scalafix` = scalafixProject("sbt-tpolecat") 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._ From abd6eae77df30f0279652489141bff3224804a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Sat, 5 Oct 2024 16:18:05 +0200 Subject: [PATCH 2/3] let's see with just this --- .github/workflows/ci.yml | 14 ++++++++++++-- build.sbt | 8 +++++--- 2 files changed, 17 insertions(+), 5 deletions(-) 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 910328f..b2a620f 100644 --- a/build.sbt +++ b/build.sbt @@ -17,6 +17,8 @@ ThisBuild / semanticdbVersion := scalafixSemanticdb.revision ThisBuild / versionScheme := Some(VersionScheme.EarlySemVer) +ThisBuild / crossScalaVersions := Seq("2.12.20", "3.3.4") + lazy val `sbt-tpolecat` = project .in(file(".")) .enablePlugins(NoPublishPlugin) @@ -54,15 +56,15 @@ lazy val `sbt-tpolecat-plugin` = project (Test / test).value scripted.toTask("").value }, - crossScalaVersions := Seq("2.12.20", "3.3.4"), - sbtVersion := { if (scalaVersion.value.startsWith("3.")) "2.0.0-M2" else "1.10.2" } + 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.20") ) ) .inputSettings(addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.0")) From 4e0f6c2806e3371121171e4661fc84d98a4f66cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Sat, 5 Oct 2024 16:25:03 +0200 Subject: [PATCH 3/3] restore 2.12.19 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index b2a620f..58a4249 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ ThisBuild / semanticdbVersion := scalafixSemanticdb.revision ThisBuild / versionScheme := Some(VersionScheme.EarlySemVer) -ThisBuild / crossScalaVersions := Seq("2.12.20", "3.3.4") +ThisBuild / crossScalaVersions := Seq("2.12.19", "3.3.4") lazy val `sbt-tpolecat` = project .in(file(".")) @@ -64,7 +64,7 @@ lazy val `sbt-tpolecat-scalafix` = scalafixProject("sbt-tpolecat") project.settings( mimaPreviousArtifacts := Set( ), - crossScalaVersions := Seq("2.12.20") + crossScalaVersions := Seq("2.12.19") ) ) .inputSettings(addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.0"))