Skip to content

Commit

Permalink
Put list example files in a different branch (#180)
Browse files Browse the repository at this point in the history
* Put list example files in a different branch

* 2 exercises

* Merge, remove ref to Lab4
  • Loading branch information
SimonGuilloud authored Nov 8, 2023
1 parent 5e1e865 commit 13eb860
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
12 changes: 7 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ val commonSettings = Seq(
version := "0.6",
crossScalaVersions := Seq("2.12.13", "2.13.4", "3.0.1", "3.2.0"),
organization := "ch.epfl.lara",
scalacOptions ++= Seq("-Ximport-suggestion-timeout", "0")
scalacOptions ++= Seq("-Ximport-suggestion-timeout", "0"),
run / fork := true
)


val scala2 = "2.13.8"
val scala3 = "3.2.2"

fork := true


val commonSettings2 = Seq(
scalaVersion := scala2,
Expand All @@ -56,9 +57,10 @@ def withTests(project: Project): ClasspathDependency =
def githubProject(repo: String, commitHash: String) = RootProject(uri(s"$repo#$commitHash"))

lazy val scallion = githubProject("https://github.com/sankalpgambhir/scallion.git", "6434e21bd08872cf547c8f0efb67c963bfdf4190")

lazy val silex = githubProject("https://github.com/epfl-lara/silex.git", "fc07a8670a5fa8ea2dd5649a00424710274a5d18")
// lazy val princess = RootProject(file("../princess")) // If you have a local copy of Princess and would like to do some changes
//lazy val princess = githubProject("https://github.com/uuverifiers/princess.git", "93cbff11d7b02903e532c7b64207bc12f19b79c7")
scallion/scalacOptions ~= (_.filterNot(Set("-Wvalue-discard")))
silex/scalacOptions ~= (_.filterNot(Set("-Wvalue-discard")))

lazy val root = Project(
id = "lisa",
Expand Down Expand Up @@ -100,4 +102,4 @@ lazy val examples = Project(
)
.settings(commonSettings)
.settings(commonSettings3)
.dependsOn(root)
.dependsOn(root)
4 changes: 0 additions & 4 deletions lisa-examples/src/main/scala/Example.scala
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ object Example extends lisa.Main {
val inductiveSet = DEF(x) --> in(∅, x) /\ forall(y, in(y, x) ==> in(succ(y), x))
show
*/

/*
Expand Down

0 comments on commit 13eb860

Please sign in to comment.