From 867038f9a536b2e7140c5302b65ce20908f07bde Mon Sep 17 00:00:00 2001 From: Daniel Slapman Date: Thu, 2 May 2024 12:26:04 +0200 Subject: [PATCH 1/2] Update Scala to 2.13.14 --- backend/build.sbt | 5 ++--- backend/project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/build.sbt b/backend/build.sbt index 1e9eabb5..2710feb0 100644 --- a/backend/build.sbt +++ b/backend/build.sbt @@ -2,15 +2,14 @@ import ProjectKeys._ import ch.epfl.scala.sbtmissinglink.MissingLinkPlugin.missinglinkConflictsTag import sbt.Keys.concurrentRestrictions -ThisBuild / scalaVersion := "2.13.13" - -ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value) +ThisBuild / scalaVersion := "2.13.14" ThisBuild / concurrentRestrictions += Tags.limit(missinglinkConflictsTag, 1) ThisBuild / evictionErrorLevel := Level.Debug ThisBuild / semanticdbEnabled := true +ThisBuild / semanticdbVersion := scalafixSemanticdb.revision val utils = (project in file("utils")) .settings(Settings.common) diff --git a/backend/project/plugins.sbt b/backend/project/plugins.sbt index f3ae42f6..a71859e4 100644 --- a/backend/project/plugins.sbt +++ b/backend/project/plugins.sbt @@ -2,7 +2,7 @@ addDependencyTreePlugin addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("ch.epfl.scala" % "sbt-missinglink" % "0.3.6") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") From fb4cb2541735b8b8e0fc294e1b9877b93fcad794 Mon Sep 17 00:00:00 2001 From: Daniel Slapman Date: Sun, 5 May 2024 20:43:45 +0200 Subject: [PATCH 2/2] Use flexible version for js module --- backend/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/build.sbt b/backend/build.sbt index 2710feb0..1d574489 100644 --- a/backend/build.sbt +++ b/backend/build.sbt @@ -79,7 +79,7 @@ val mockingbird = (project in file("mockingbird")) "com.github.geirolz" %% "advxml-xpath" % "2.5.1", "io.estatico" %% "newtype" % "0.4.4", "org.mozilla" % "rhino" % "1.7.14", - "org.graalvm.polyglot" % "js" % "23.1.2", + "org.graalvm.polyglot" % "js" % "23.1.+", "org.slf4j" % "slf4j-api" % "1.7.30" % Provided ), Compile / unmanagedResourceDirectories += file("../frontend/dist")