Skip to content

POC: support sbt 2 #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+18 −6
Draft

POC: support sbt 2 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14a7a50
POC: support sbt 2
kubukoz Oct 5, 2024
abd6eae
let's see with just this
kubukoz Oct 5, 2024
4e0f6c2
restore 2.12.19
kubukoz Oct 5, 2024
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
14 changes: 12 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("."))
Expand Down Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
Loading