Skip to content

Commit c4a549b

Browse files
authored
Fix cross-version conflict errors in the "docs" subproject. (#230)
1 parent 0ee45be commit c4a549b

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ git.useGitDescribe := true
66

77
organization := "ch.epfl.lara"
88

9-
scalaVersion := "3.5.2"
9+
val inoxScalaVersion = "3.5.2"
10+
scalaVersion := inoxScalaVersion
1011

1112
scalacOptions ++= Seq(
1213
"-deprecation",
@@ -132,7 +133,8 @@ lazy val docs = project
132133
mdocIn := file("src/main/doc"),
133134
mdocOut := file("doc"),
134135
mdocExtraArguments := Seq("--no-link-hygiene"),
135-
scalaVersion := "3.0.2",
136+
scalaVersion := inoxScalaVersion,
137+
excludeDependencies := Seq("org.scala-lang.modules" % "scala-parser-combinators_2.13"),
136138
)
137139
.enablePlugins(MdocPlugin)
138140

doc/interpolations.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ It is also possible to embed types and expressions:
6161
```scala
6262
e"let x: $tpe = $expr in !x"
6363
// res0: Expr = val x: Boolean = 1 + 1 == 2
64-
// ¬x
64+
// !x
6565
```
6666

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

193193
```scala
194194
e"forall x: Int. x > 0"
195-
// res16: Expr = x: Int. (x > 0)
195+
// res16: Expr = forall((x: Int) => (x > 0))
196196
e"∀x. x || true"
197-
// res17: Expr = x: Boolean. (x || true)
197+
// res17: Expr = forall((x: Boolean) => (x || true))
198198
```
199199

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

203203
```scala
204204
e"exists x: BigInt. x < 0"
205-
// res18: Expr = ¬∀x: BigInt. ¬(x < 0)
205+
// res18: Expr = !forall((x: BigInt) => !(x < 0))
206206
e"∃x, y. x + y == 0"
207-
// res19: Expr = ¬∀x: BigInt, y: BigInt. (x + y ≠ 0)
207+
// res19: Expr = !forall((x: BigInt, y: BigInt) => (x + y != 0))
208208
```
209209

210210
<a name="choose"></a>

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

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

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

0 commit comments

Comments
 (0)