Skip to content

Commit b94325b

Browse files
authored
Merge pull request #216 from xuwei-k/sbt-2-0-0-RC9
sbt 2.0.0-RC10
2 parents f57ec5a + a1bc0be commit b94325b

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@ jobs:
1616
- jobtype: 4
1717
steps:
1818
- uses: actions/checkout@v6
19-
- name: Setup JDK
19+
- name: Setup JDK 8
2020
uses: actions/setup-java@v5
21+
if: ${{ matrix.jobtype != 3 }}
2122
with:
2223
distribution: temurin
23-
java-version: 11
24+
java-version: 8
25+
cache: sbt
26+
- name: Setup JDK 17
27+
uses: actions/setup-java@v5
28+
if: ${{ matrix.jobtype == 3 }}
29+
with:
30+
distribution: temurin
31+
java-version: 17
2432
cache: sbt
2533
- uses: sbt/setup-sbt@v1
2634
- if: ${{ matrix.jobtype == 1 }}

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ lazy val plugin = (project in file("plugin"))
6969
scalaBinaryVersion.value match {
7070
case "2.13" => "1.5.8"
7171
case "2.12" => "1.5.8" // set minimum sbt version
72-
case _ => "2.0.0-RC6"
72+
case _ => "2.0.0-RC10"
7373
}
7474
},
7575
scriptedSbt := {
7676
scalaBinaryVersion.value match {
7777
case "2.12" => "1.10.7"
78-
case _ => "2.0.0-RC8"
78+
case _ => "2.0.0-RC10"
7979
}
8080
},
8181
publishLocal := (publishLocal dependsOn (library / publishLocal)).value,

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Keys.*
44
object Dependencies {
55
val scala212 = "2.12.20"
66
val scala213 = "2.13.15"
7-
val scala3 = "3.7.3"
7+
val scala3 = "3.8.2"
88

99
val sjsonNewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % "0.10.0"
1010
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19"

0 commit comments

Comments
 (0)