diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 533867e..1ab189b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 46086e1..580d659 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -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 diff --git a/build.sbt b/build.sbt index bc7ba5e..6bf8a11 100644 --- a/build.sbt +++ b/build.sbt @@ -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" @@ -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 } }, @@ -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 := {