Skip to content

Commit 68d6d36

Browse files
authored
Merge pull request #193 from xuwei-k/sbt-2-0-0-M3
add sbt 2 cross build setting
2 parents 8db8710 + f6c20f5 commit 68d6d36

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
8080

8181
- shell: bash
82-
run: sbt '++ ${{ matrix.scala }}' test scripted
82+
run: sbt '++ ${{ matrix.scala }}' '+ test' scripted
8383

8484
- name: Compress target directories
8585
shell: bash

build.sbt

+18-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ThisBuild / crossScalaVersions := Seq(scala212)
2222
ThisBuild / scalaVersion := scala212
2323

2424
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest", "windows-latest")
25-
ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "scripted")))
25+
ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("+ test", "scripted")))
2626
ThisBuild / githubWorkflowJavaVersions ++= Seq(
2727
JavaSpec.graalvm(Graalvm.Distribution("graalvm"), "17"),
2828
JavaSpec.corretto("17")
@@ -64,7 +64,15 @@ ThisBuild / dynver := {
6464
}
6565

6666
sbtPlugin := true
67-
pluginCrossBuild / sbtVersion := "1.5.5"
67+
pluginCrossBuild / sbtVersion := {
68+
scalaBinaryVersion.value match {
69+
case "2.12" =>
70+
"1.5.5"
71+
case _ =>
72+
"2.0.0-M3"
73+
}
74+
}
75+
crossScalaVersions += "3.6.2"
6876

6977
publishMavenStyle := true
7078

@@ -79,7 +87,14 @@ scriptedLaunchOpts ++= Seq("-Dplugin.version=" + version.value)
7987
scriptedBufferLog := true
8088
// This sbt version is necessary for CI to work on windows with
8189
// scripted tests, see https://github.com/sbt/sbt/pull/7087
82-
scriptedSbt := "1.10.2"
90+
scriptedSbt := {
91+
scalaBinaryVersion.value match {
92+
case "2.12" =>
93+
"1.10.2"
94+
case _ =>
95+
scriptedSbt.value
96+
}
97+
}
8398

8499
ThisBuild / homepage := Some(url("https://github.com/sbt/sbt-github-actions"))
85100
ThisBuild / startYear := Some(2020)

src/main/scala/sbtghactions/GenerativePlugin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package sbtghactions
1818

1919
import sbt.Keys._
20-
import sbt._
20+
import sbt.{given, _}
2121

2222
import java.nio.file.FileSystems
2323
import scala.concurrent.duration.FiniteDuration

0 commit comments

Comments
 (0)