Skip to content

Commit 418a124

Browse files
authored
Merge pull request #352 from xuwei-k/sbt-2-0-0-RC9
sbt 2.0.0-RC9
2 parents 3f43ea5 + fb53404 commit 418a124

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- java: 8
1414
distribution: temurin
1515
sbt: 1
16-
- java: 8
16+
- java: 17
1717
distribution: temurin
1818
sbt: 2
1919
runs-on: ubuntu-latest

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/setup-java@v5
2222
with:
2323
distribution: temurin
24-
java-version: 8
24+
java-version: 17
2525
cache: sbt
2626
- uses: sbt/setup-sbt@v1
2727
- name: Release

build.sbt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ homepage := scmInfo.value map (_.browseUrl)
88
scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-git"), "scm:git:git@github.com:sbt/sbt-git.git"))
99

1010
lazy val scala212 = "2.12.21"
11-
lazy val scala3 = "3.7.4"
11+
lazy val scala3 = "3.8.1"
1212

1313
crossScalaVersions := Seq(scala212, scala3)
1414

@@ -24,7 +24,18 @@ libraryDependencies ++= Seq(
2424
(pluginCrossBuild / sbtVersion) := {
2525
scalaBinaryVersion.value match {
2626
case "2.12" => "1.5.8"
27-
case _ => "2.0.0-RC3"
27+
case _ => "2.0.0-RC9"
28+
}
29+
}
30+
31+
scalacOptions ++= {
32+
scalaBinaryVersion.value match {
33+
case "2.12" =>
34+
Seq(
35+
"-release:8"
36+
)
37+
case "3" =>
38+
Nil
2839
}
2940
}
3041

0 commit comments

Comments
 (0)