diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eaa8215b..fcbe93c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,16 +19,6 @@ jobs: with: distribution: temurin java-version: 21 - - 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 }}-scala-native-only - - name: Build dependencies - run: ./dependencies/publish-deps.sh --scala-native-only - name: Test Formatting run: sbt scalafmtCheckAll test-jvm: @@ -45,16 +35,6 @@ jobs: with: distribution: temurin java-version: 21 - - 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 }}-scala-native-only - - name: Build dependencies - run: ./dependencies/publish-deps.sh --scala-native-only - name: Test run: sbt rootJVM/test test-native: @@ -86,4 +66,4 @@ jobs: - name: Test run: sbt rootNative/test - name: Stress Test with Lower Memory - run: env GC_MAXIMUM_HEAP_SIZE=512M sbt 'rootNative/testOnly StressTest' + run: env GC_MAXIMUM_HEAP_SIZE=128M sbt 'rootNative/testOnly StressTest' diff --git a/.gitmodules b/.gitmodules index 6a257eda..47c14c35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "dependencies/scala-native"] - path = dependencies/scala-native - url = https://github.com/scala-native/scala-native.git [submodule "dependencies/munit"] path = dependencies/munit url = https://github.com/natsukagami/munit.git diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1c09ebba..3d567a75 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. See the pinned versions in [`dependencies`](./dependencies/README.md). +- **On Scala Native**: Scala Native with delimited continuations support. Right now we are using `0.5-RC1`. All of the needed dependencies can be loaded by the included Nix Flake. If you have `nix` with `flake` enabled, run ``` diff --git a/build.sbt b/build.sbt index 21e26900..8341d648 100644 --- a/build.sbt +++ b/build.sbt @@ -26,6 +26,6 @@ lazy val root = nativeConfig ~= { c => c.withMultithreadingSupport(true) }, - libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10+16-4e2ab919-SNAPSHOT" % Test + libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10+17-0ca7e7e9-SNAPSHOT" % Test ) ) diff --git a/dependencies/README.md b/dependencies/README.md index 0108d421..a1f100a3 100644 --- a/dependencies/README.md +++ b/dependencies/README.md @@ -16,12 +16,7 @@ nix develop .#dependencies -c dependencies/publish-deps.sh ### What are included? -- The current snapshot version of Scala Native, pinned in `scala-native`: for the delimited continuation support. - This needs to be published for both `3.3.1` (for `gears`) and `3.1.2` (for `munit`): - ```bash - sbt "publish-local-dev 3; ++3.1.2 publishLocal" - ``` -- A fork of `munit` that uses the above snapshot, with a simple fix (https://github.com/scalameta/munit/pull/714) to make it compile. +- A fork of `munit` that uses `scala-native` 0.5-RC1. Pinned in `munit`. ```bash sbt "munitNative/publishLocal" diff --git a/dependencies/munit b/dependencies/munit index 4e2ab919..0ca7e7e9 160000 --- a/dependencies/munit +++ b/dependencies/munit @@ -1 +1 @@ -Subproject commit 4e2ab919efd31595ccf0df7cf518655d8d2de40c +Subproject commit 0ca7e7e9f092bae37ce555ff2aff7c89d9d8d5ed diff --git a/dependencies/publish-deps.sh b/dependencies/publish-deps.sh index d1476b9b..d7b74e77 100755 --- a/dependencies/publish-deps.sh +++ b/dependencies/publish-deps.sh @@ -4,10 +4,5 @@ set -e cd "$(dirname "${BASH_SOURCE[0]}")" # change to this directory -cd scala-native && sbt 'publish-local-dev 2.12' && cd .. - -if test "$1" != "--scala-native-only"; then - cd scala-native && sbt '++3.3.1 publishLocal; ++3.1.2 publishLocal' && cd .. - cd munit && sbt "++3.1.2 munitNative/publishLocal" && cd .. -fi +cd munit && sbt "++3.1.2 munitNative/publishLocal" && cd .. diff --git a/dependencies/scala-native b/dependencies/scala-native deleted file mode 160000 index 174fcb02..00000000 --- a/dependencies/scala-native +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 174fcb02fcd8097e15425205922d70dbd154c017 diff --git a/project/plugins.sbt b/project/plugins.sbt index d194f0e2..73f58731 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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-SNAPSHOT") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0-RC1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")