Skip to content

Commit b727dc3

Browse files
authored
Merge pull request #65 from xuwei-k/sbt-2-0-0-RC9
sbt 2.0.0-RC9
2 parents 51a9d23 + 2c31fff commit b727dc3

3 files changed

Lines changed: 14 additions & 6 deletions

File tree

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
id: coursier-cache
2323
uses: coursier/cache-action@v8
2424

25-
- name: Install Adoptium Temurin OpenJDK
26-
uses: coursier/setup-action@v2
25+
- uses: actions/setup-java@v5
2726
with:
28-
jvm: adoptium:8
27+
distribution: temurin
28+
java-version: 17
2929

3030
- name: Install sbt
3131
uses: sbt/setup-sbt@v1

.github/workflows/scala.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,18 @@ jobs:
2323
- uses: actions/checkout@v6
2424
- name: Set up JDK 1.8
2525
uses: actions/setup-java@v5
26+
if: ${{ matrix.jobtype == 1 }}
2627
with:
2728
distribution: temurin
2829
java-version: 8.0.372+7
2930
cache: sbt
31+
- name: Set up JDK 17
32+
uses: actions/setup-java@v5
33+
if: ${{ matrix.jobtype == 2 }}
34+
with:
35+
distribution: temurin
36+
java-version: 17
37+
cache: sbt
3038
- name: Install sbt
3139
uses: sbt/setup-sbt@v1
3240
- name: Build and test

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ val packagerVersion = "1.11.7"
77
val packager19xVersion = "1.9.16"
88

99
val scala212 = "2.12.21"
10-
val scala3 = "3.7.4"
10+
val scala3 = "3.8.1"
1111

1212
addSbtPlugin(
1313
"com.github.sbt" % "sbt-native-packager" % packagerVersion % "provided"
@@ -45,7 +45,7 @@ lazy val `sbt-javaagent` = (project.in(file(".")))
4545
crossScalaVersions := Seq(scala212, scala3),
4646
scalacOptions ++= {
4747
scalaBinaryVersion.value match {
48-
case "2.12" => Seq("-Xsource:3")
48+
case "2.12" => Seq("-Xsource:3", "-release:8")
4949
case _ => Nil
5050
}
5151
},
@@ -62,7 +62,7 @@ lazy val `sbt-javaagent` = (project.in(file(".")))
6262
(pluginCrossBuild / sbtVersion) := {
6363
scalaBinaryVersion.value match {
6464
case "2.12" => "1.11.6"
65-
case _ => "2.0.0-RC6"
65+
case _ => "2.0.0-RC9"
6666
}
6767
},
6868
scriptedSbt := {

0 commit comments

Comments
 (0)