From a619d4550e304bffacb37cf073ae13fc3c0b3f16 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Fri, 20 Dec 2024 16:22:43 +0100 Subject: [PATCH] improvement: Allow sbt BSP to run on earlier JDK --- .github/workflows/ci.yml | 7 +++++-- build.sbt | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f48120b8e3..2c09956977b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,9 @@ jobs: os: macOS-latest java: "17" - type: sbt - command: bin/test.sh '+sbt-metals/publishLocal; slow/testOnly -- tests.sbt.*' + command: | + bin/test.sh +sbt-metals/publishLocal + bin/test.sh 'slow/testOnly -- tests.sbt.*' name: Sbt integration os: ubuntu-latest java: "17" @@ -148,7 +150,8 @@ jobs: with: sbt-runner-version: 1.10.3 - name: ${{ matrix.command }} - run: ${{ matrix.command }} + run: | + ${{ matrix.command }} env: METALS_TEST: true GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} diff --git a/build.sbt b/build.sbt index 336715806cb..57769b723d8 100644 --- a/build.sbt +++ b/build.sbt @@ -527,6 +527,7 @@ lazy val `sbt-metals` = project ), scalaVersion := V.scala212, crossScalaVersions := Seq(V.scala212, V.scala3ForSBT2), + scalacOptions := Seq("-release", "8"), scriptedLaunchOpts ++= Seq(s"-Dplugin.version=${version.value}"), (pluginCrossBuild / sbtVersion) := { scalaBinaryVersion.value match {