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

Fix cross-version conflict errors in the "docs" subproject. #230

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ git.useGitDescribe := true

organization := "ch.epfl.lara"

scalaVersion := "3.5.2"
val inoxScalaVersion = "3.5.2"
scalaVersion := inoxScalaVersion

scalacOptions ++= Seq(
"-deprecation",
Expand Down Expand Up @@ -132,7 +133,8 @@ lazy val docs = project
mdocIn := file("src/main/doc"),
mdocOut := file("doc"),
mdocExtraArguments := Seq("--no-link-hygiene"),
scalaVersion := "3.0.2",
scalaVersion := inoxScalaVersion,
excludeDependencies := Seq("org.scala-lang.modules" % "scala-parser-combinators_2.13"),
)
.enablePlugins(MdocPlugin)

Expand Down
10 changes: 5 additions & 5 deletions doc/interpolations.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ It is also possible to embed types and expressions:
```scala
e"let x: $tpe = $expr in !x"
// res0: Expr = val x: Boolean = 1 + 1 == 2
// ¬x
// !x
```

<a name="syntax"></a>
Expand Down Expand Up @@ -192,19 +192,19 @@ e"lambda x. x * 0.5"

```scala
e"forall x: Int. x > 0"
// res16: Expr = x: Int. (x > 0)
// res16: Expr = forall((x: Int) => (x > 0))
e"∀x. x || true"
// res17: Expr = x: Boolean. (x || true)
// res17: Expr = forall((x: Boolean) => (x || true))
```

<a name="existential-quantifiers"></a>
### Existential Quantifier

```scala
e"exists x: BigInt. x < 0"
// res18: Expr = ¬∀x: BigInt. ¬(x < 0)
// res18: Expr = !forall((x: BigInt) => !(x < 0))
e"∃x, y. x + y == 0"
// res19: Expr = ¬∀x: BigInt, y: BigInt. (x + y ≠ 0)
// res19: Expr = !forall((x: BigInt, y: BigInt) => (x + y != 0))
```

<a name="choose"></a>
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.3")

addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")

Expand Down