Skip to content

Commit

Permalink
Update scala-native to 0.5.1 and munit to 1.0.0-RC1 (#66)
Browse files Browse the repository at this point in the history
  • Loading branch information
natsukagami authored May 8, 2024
1 parent c9f1815 commit 1eeca5a
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 54 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 19
- name: Get submodule status hash
id: get-submodules
run: echo "submodules=$(git submodule status | sha256sum | awk '{print $1}')" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
with:
path: |
./dependencies/**/target
key: ${{ runner.os }}-${{ steps.get-submodules.outputs.submodules }}
- name: Build dependencies
run: ./dependencies/publish-deps.sh
java-version: 21
- name: Install scala-native dependencies
run: sudo apt-get install clang libstdc++-12-dev libgc-dev
- name: Test
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

`gears` currently require:
- **On the JVM**: JVM with support for virtual threads. This usually means JVM 21+, or 19+ with `--enable-preview`.
- **On Scala Native**: Scala Native with delimited continuations support. Right now we are using `0.5-RC1`.
- **On Scala Native**: Scala Native with delimited continuations support, which are available from 0.5.0. Right now we are using `0.5.1`.

All of the needed dependencies can be loaded by the included Nix Flake. If you have `nix` with `flake` enabled, run
```
Expand Down
9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,19 @@ lazy val root =
name := "Gears",
organization := "ch.epfl.lamp",
version := "0.2.0-SNAPSHOT",
libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-RC1" % Test,
testFrameworks += new TestFramework("munit.Framework")
)
)
.jvmSettings(
Seq(
javaOptions += "--version 21",
libraryDependencies += "org.scalameta" %% "munit" % "1.0.0-M10" % Test
javaOptions += "--version 21"
)
)
.nativeSettings(
Seq(
nativeConfig ~= { c =>
c.withMultithreadingSupport(true)
},
libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10+17-0ca7e7e9-SNAPSHOT" % Test
c.withMultithreading(true)
}
)
)
23 changes: 0 additions & 23 deletions dependencies/README.md

This file was deleted.

1 change: 0 additions & 1 deletion dependencies/munit
Submodule munit deleted from 0ca7e7
8 changes: 0 additions & 8 deletions dependencies/publish-deps.sh

This file was deleted.

2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0-RC1")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")

0 comments on commit 1eeca5a

Please sign in to comment.