Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
id: coursier-cache
uses: coursier/cache-action@v8

- name: Install Adoptium Temurin OpenJDK
uses: coursier/setup-action@v2
- uses: actions/setup-java@v5
with:
jvm: adoptium:8
distribution: temurin
java-version: 17

- name: Install sbt
uses: sbt/setup-sbt@v1
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,18 @@ jobs:
- uses: actions/checkout@v6
- name: Set up JDK 1.8
uses: actions/setup-java@v5
if: ${{ matrix.jobtype == 1 }}
with:
distribution: temurin
java-version: 8.0.372+7
cache: sbt
- name: Set up JDK 17
uses: actions/setup-java@v5
if: ${{ matrix.jobtype == 2 }}
with:
distribution: temurin
java-version: 17
cache: sbt
- name: Install sbt
uses: sbt/setup-sbt@v1
- name: Build and test
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ val packagerVersion = "1.11.7"
val packager19xVersion = "1.9.16"

val scala212 = "2.12.21"
val scala3 = "3.7.4"
val scala3 = "3.8.1"

addSbtPlugin(
"com.github.sbt" % "sbt-native-packager" % packagerVersion % "provided"
Expand Down Expand Up @@ -45,7 +45,7 @@ lazy val `sbt-javaagent` = (project.in(file(".")))
crossScalaVersions := Seq(scala212, scala3),
scalacOptions ++= {
scalaBinaryVersion.value match {
case "2.12" => Seq("-Xsource:3")
case "2.12" => Seq("-Xsource:3", "-release:8")
case _ => Nil
}
},
Expand All @@ -62,7 +62,7 @@ lazy val `sbt-javaagent` = (project.in(file(".")))
(pluginCrossBuild / sbtVersion) := {
scalaBinaryVersion.value match {
case "2.12" => "1.11.6"
case _ => "2.0.0-RC6"
case _ => "2.0.0-RC9"
}
},
scriptedSbt := {
Expand Down