Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update documentation and scripts 3.3.0 -> 3.3.3 #1516

Merged
merged 2 commits into from
May 2, 2024
Merged

Update documentation and scripts 3.3.0 -> 3.3.3 #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1523fb4
change all occurences of scala version, in scripts and docs
samuelchassot May 2, 2024
742314f
missing files in previous cmmits
samuelchassot May 2, 2024
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ It is shipped with Z3 4.12.2, cvc5 1.0.8 and Princess. If Z3 API is not found, u

## SBT Stainless plugin

Alternatively, one may integrate Stainless with SBT. The supported Scala versions are `3.3.0` and `2.13.12`
Alternatively, one may integrate Stainless with SBT. The supported Scala versions are `3.3.3` and `2.13.12`
To do so, download [sbt-stainless](https://github.com/epfl-lara/stainless/releases), and move it to the directory of the project.
Assuming the project's structure is:
```
Expand Down Expand Up @@ -73,7 +73,7 @@ For instance:
```scala
ThisBuild / version := "0.1.0"

ThisBuild / scalaVersion := "3.3.0"
ThisBuild / scalaVersion := "3.3.3"

lazy val myTestProject = (project in file("."))
.enablePlugins(StainlessPlugin) // <--------
Expand Down
2 changes: 1 addition & 1 deletion bin/package-sbt-plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if [[ $(git diff --stat) != '' ]]; then
STAINLESS_VERSION="$STAINLESS_VERSION-SNAPSHOT"
fi

SCALA_VERSION="3.3.0"
SCALA_VERSION="3.3.3"
SCALA_LIB_VERSION="2.13"
PUBLISHED_SBT_PLUGIN_DIR="$HOME/.ivy2/local/ch.epfl.lara/sbt-stainless/scala_2.12/sbt_1.0/$STAINLESS_VERSION"
PUBLISHED_LIB_DIR="$HOME/.ivy2/local/ch.epfl.lara/stainless-library_$SCALA_LIB_VERSION/$STAINLESS_VERSION"
Expand Down
4 changes: 2 additions & 2 deletions bin/package-standalone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [[ $(git diff --stat) != '' ]]; then
STAINLESS_VERSION="$STAINLESS_VERSION-SNAPSHOT"
fi

SCALA_VERSION="3.3.0"
SCALA_VERSION="3.3.3"
LIB_SCALA_VERSION="2.13"
Z3_VERSION="4.12.2"
CVC5_VERSION="1.0.8"
Expand Down Expand Up @@ -290,4 +290,4 @@ info "$(tput bold)[] Cleaning up..."
# We only clean up the directories used for packaging; we leave the downloaded Z3/cvc5 binaries.
rm -r "$TMP_DIR/linux" "$TMP_DIR/mac-arm64" "$TMP_DIR/mac-x64" "$TMP_DIR/win" && okay

info "$(tput bold)Packaging successful."
info "$(tput bold)Packaging successful."
2 changes: 1 addition & 1 deletion core/src/sphinx/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ Instead, please use ``sbt stainless-scalac-standalone/assembly`` as follows:
$ sbt stainless-scalac-standalone/assembly
// takes about 1 minutes

Running Stainless can then be done with the command: ``java -jar frontends\stainless-dotty-standalone\target\scala-3.3.0\stainless-dotty-standalone-{VERSION}.jar``, where ``VERSION`` denotes Stainless version.
Running Stainless can then be done with the command: ``java -jar frontends\stainless-dotty-standalone\target\scala-3.3.3\stainless-dotty-standalone-{VERSION}.jar``, where ``VERSION`` denotes Stainless version.

Running Tests
-------------
Expand Down
4 changes: 2 additions & 2 deletions sbt-plugin/src/sbt-test/sbt-plugin/ghost/test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
> + tailrec/run
> + basic/run
$ exists basic/target/scala-2.13/classes/test/Main.class
$ exists basic/target/scala-3.3.0/classes/test/Main.class
$ exists basic/target/scala-3.3.3/classes/test/Main.class
$ absent basic/target/sneakyGhostCalled basic/target/insideGhostCalled
> + actor-tests/compile
> + actor-tests/compile
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/sbt-plugin/simple/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
> + success/compile
# check that a module on which stainless verification passes compiles fine (i.e., binaries are produced)
$ exists success/target/scala-2.13/classes/Extern1.class
$ exists success/target/scala-3.3.0/classes/Extern1.class
$ exists success/target/scala-3.3.3/classes/Extern1.class
# > failure/checkScalaFailures