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
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
build:
strategy:
matrix:
scalaVersion: ["2.13.15", "3.5.2"]
scalaVersion: ["2.13.18", "3.5.2"]
runs-on: ubuntu-24.04

steps:
Expand All @@ -28,9 +28,9 @@ jobs:
jvm: adoptium:1.17
apps: sbt metals

- uses: actions/setup-node@v4
- uses: actions/setup-node@v6
with:
node-version: "18"
node-version: "24"
cache: "yarn"
cache-dependency-path: formidable/package.json

Expand Down Expand Up @@ -69,12 +69,12 @@ jobs:
- name: Check if working directory is clean
run: git diff --quiet --exit-code || (git status && false)

- name: Check if scala version is compatible with latest metals
run: |
SCALA_VERSION=$(sed -nr 's/.*scalaVersion\s+:=\s+"(.*)"/\1/p' build.sbt)
METALS_SUPPORTED_VERSIONS=$(metals --version)
echo "$METALS_SUPPORTED_VERSIONS"
metals --version | grep "$SCALA_VERSION" || (echo "Scala $SCALA_VERSION not supported by metals."; false)
# - name: Check if scala version is compatible with latest metals
# run: |
# SCALA_VERSION=$(sed -nr 's/.*scalaVersion\s+:=\s+"(.*)"/\1/p' build.sbt)
# METALS_SUPPORTED_VERSIONS=$(metals --version)
# echo "$METALS_SUPPORTED_VERSIONS"
# metals --version | grep "$SCALA_VERSION" || (echo "Scala $SCALA_VERSION not supported by metals."; false)

- name: Deploy to Github Pages
if: github.ref == 'refs/heads/main' && startsWith(matrix.scalaVersion, '2.13')
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Global / onChangedBuildSource := IgnoreSourceChanges // not working well with we

name := "Formidable"
ThisBuild / organization := "com.github.fdietze"
ThisBuild / crossScalaVersions := Seq("2.13.15", "3.5.2")
ThisBuild / crossScalaVersions := Seq("2.13.18", "3.5.2")
ThisBuild / scalaVersion := crossScalaVersions.value.head

inThisBuild(
Expand Down Expand Up @@ -72,7 +72,7 @@ lazy val formidable = project
) ++
(if (isScala3.value) Seq("com.softwaremill.magnolia1_3" %%% "magnolia" % "1.3.16")
else
Seq("com.softwaremill.magnolia1_2" %%% "magnolia" % "1.1.10", "org.scala-lang" % "scala-reflect" % "2.13.15")),
Seq("com.softwaremill.magnolia1_2" %%% "magnolia" % "1.1.10", "org.scala-lang" % "scala-reflect" % "2.13.18")),
Compile / npmDependencies ++= readJsDependencies(baseDirectory.value, "dependencies"),
Compile / npmDevDependencies ++= readJsDependencies(baseDirectory.value, "devDependencies"),
useYarn := true, // Makes scalajs-bundler use yarn instead of npm
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")

addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
Expand Down
Loading