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.

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

Bumped compiler version to 3.5.2 and removed a patmat warning #1599

Merged
merged 3 commits into from
Nov 5, 2024
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
4 changes: 2 additions & 2 deletions bin/package-sbt-plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ if [[ $(git diff --stat) != '' ]]; then
STAINLESS_VERSION="$STAINLESS_VERSION-SNAPSHOT"
fi

SCALA_VERSION="3.5.0"
SCALA_LIB_VERSION="3.5.0"
SCALA_VERSION="3.5.2"
SCALA_LIB_VERSION="3.5.2"
PUBLISHED_SBT_PLUGIN_DIR="$HOME/.ivy2/local/ch.epfl.lara/sbt-stainless/scala_2.12/sbt_1.0/$STAINLESS_VERSION"
LIB_SCALA_VERSION_JAR_NAME_PART=$(echo $SCALA_LIB_VERSION | cut -d '.' -f 1)
PUBLISHED_LIB_DIR="$HOME/.ivy2/local/ch.epfl.lara/stainless-library_$LIB_SCALA_VERSION_JAR_NAME_PART/$STAINLESS_VERSION"
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ lazy val nTestSuiteParallelism = {

// The Scala version with which Stainless is compiled.
// Note: in case of version bump, do not forget to update the `test` files in `sbt-plugin` (for `sbt scripted`)!
val stainlessScalaVersion = "3.5.0"
val stainlessScalaVersion = "3.5.2"
val frontendDottyVersion = stainlessScalaVersion
// The Stainless libraries use Scala 2.13 and Scala 3.3, and is compatible only with Scala 3.3.
// The Stainless libraries use Scala 2.13 and Scala 3.5, and is compatible only with Scala 3.5.
val stainlessLibScalaVersion = stainlessScalaVersion

scalaVersion := stainlessScalaVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class FunctionInlining(override val s: Trees, override val t: trace.Trees)
Assert(annotated(cond.setPos(fi), DropVCs), Some(s"Inlined precondition$num of " + tfd.id.asString), acc).setPos(fi),
i-1
)
case (spec, (acc,i)) => context.reporter.fatalError(f"In addPreconditionAssertions, I did not expect spec that is not LetInSpec or Precondition; I got the following spec: ${spec.toString}")
}._1
}

Expand Down
2 changes: 1 addition & 1 deletion inox
Submodule inox updated 1 files
+1 −1 build.sbt
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/sbt-plugin/ghost/test
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
> + tailrec/run
> + basic/run
$ exists basic/target/scala-3.5.0/classes/test/Main.class
$ exists basic/target/scala-3.5.2/classes/test/Main.class
$ absent basic/target/sneakyGhostCalled basic/target/insideGhostCalled
> + actor-tests/compile
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/sbt-plugin/simple/test
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
> assertLogMessage
> + success/compile
# check that a module on which stainless verification passes compiles fine (i.e., binaries are produced)
$ exists success/target/scala-3.5.0/classes/Extern1.class
$ exists success/target/scala-3.5.2/classes/Extern1.class
# > failure/checkScalaFailures
Loading