Skip to content

Commit 840eb4a

Browse files
committed
sbt 2 build setting
1 parent 072c1b8 commit 840eb4a

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
java-version: ${{ matrix.java }}
2222
- uses: sbt/setup-sbt@v1
2323
- name: Run tests
24-
run: sbt test
24+
run: sbt "+ update" test

build.sbt

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,29 @@ libraryDependencies ++= Seq(
88
(pluginCrossBuild / sbtBinaryVersion).value,
99
(pluginCrossBuild / scalaBinaryVersion).value
1010
),
11-
Defaults.sbtPluginExtra(
12-
"org.playframework.twirl" % "sbt-twirl" % "2.0.9",
13-
(pluginCrossBuild / sbtBinaryVersion).value,
14-
(pluginCrossBuild / scalaBinaryVersion).value
15-
),
11+
{
12+
val v = scalaBinaryVersion.value match {
13+
case "2.12" =>
14+
"2.0.9"
15+
case "3" =>
16+
"2.1.0-M5"
17+
}
18+
Defaults.sbtPluginExtra(
19+
"org.playframework.twirl" % "sbt-twirl" % v,
20+
(pluginCrossBuild / sbtBinaryVersion).value,
21+
(pluginCrossBuild / scalaBinaryVersion).value
22+
)
23+
}
1624
)
25+
pluginCrossBuild / sbtVersion := {
26+
scalaBinaryVersion.value match {
27+
case "2.12" =>
28+
sbtVersion.value
29+
case _ =>
30+
"2.0.0-RC6"
31+
}
32+
}
33+
crossScalaVersions += "3.7.3"
1734
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
1835
publishTo := (if (isSnapshot.value) None else localStaging.value)
1936
publishMavenStyle := true

0 commit comments

Comments
 (0)