Skip to content

Commit 42d119f

Browse files
authored
Merge pull request #76 from mkurz/sbt2cross-update
Update sbt 2 cross build settings
2 parents bb46ddd + 957a191 commit 42d119f

3 files changed

Lines changed: 2 additions & 7 deletions

File tree

‎.github/scala-steward.conf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ pullRequests.grouping = [
77
]
88

99
updates.pin = [
10-
// sbt-digest is a sbt plugin and sbt plugins use Scala 2.12
11-
{ groupId = "org.scala-lang", artifactId = "scala-compiler", version = "2.12." },
12-
{ groupId = "org.scala-lang", artifactId = "scala-library", version = "2.12." },
13-
{ groupId = "org.scala-lang", artifactId = "scala-reflect", version = "2.12." },
14-
{ groupId = "org.scala-lang", artifactId = "scalap", version = "2.12." }
1510
]
1611

1712
updatePullRequests = never

‎.github/workflows/build-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Tests
1818
uses: playframework/.github/.github/workflows/cmd.yml@v3
1919
with:
20-
java: 17, 11, 8
20+
java: 25, 17, 11, 8
2121
scala: 2.12.21, 3.8.3
2222
# Scala 3.8.x compiler bridge requires Java 17 (excludes 8 and 11).
2323
exclude: '[{"java": "8", "scala": "3.8.3"}, {"java": "11", "scala": "3.8.3"}]'

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pluginCrossBuild / sbtVersion := {
2727

2828
scalacOptions := {
2929
CrossVersion.partialVersion(scalaVersion.value) match {
30-
case Some((2, _)) => Seq("-Xsource:3")
30+
case Some((2, _)) => Seq("-Xsource:3", "-release:8")
3131
case _ => Seq.empty
3232
}
3333
}

0 commit comments

Comments
 (0)