Skip to content
Snippets Groups Projects
Unverified Commit 13eb8604 authored by SimonGuilloud's avatar SimonGuilloud Committed by GitHub
Browse files

Put list example files in a different branch (#180)

* Put list example files in a different branch

* 2 exercises

* Merge, remove ref to Lab4
parent 5e1e8651
Branches
No related tags found
No related merge requests found
...@@ -22,14 +22,15 @@ val commonSettings = Seq( ...@@ -22,14 +22,15 @@ val commonSettings = Seq(
version := "0.6", version := "0.6",
crossScalaVersions := Seq("2.12.13", "2.13.4", "3.0.1", "3.2.0"), crossScalaVersions := Seq("2.12.13", "2.13.4", "3.0.1", "3.2.0"),
organization := "ch.epfl.lara", 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 scala2 = "2.13.8"
val scala3 = "3.2.2" val scala3 = "3.2.2"
fork := true
val commonSettings2 = Seq( val commonSettings2 = Seq(
scalaVersion := scala2, scalaVersion := scala2,
...@@ -56,9 +57,10 @@ def withTests(project: Project): ClasspathDependency = ...@@ -56,9 +57,10 @@ def withTests(project: Project): ClasspathDependency =
def githubProject(repo: String, commitHash: String) = RootProject(uri(s"$repo#$commitHash")) def githubProject(repo: String, commitHash: String) = RootProject(uri(s"$repo#$commitHash"))
lazy val scallion = githubProject("https://github.com/sankalpgambhir/scallion.git", "6434e21bd08872cf547c8f0efb67c963bfdf4190") 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 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 scallion/scalacOptions ~= (_.filterNot(Set("-Wvalue-discard")))
//lazy val princess = githubProject("https://github.com/uuverifiers/princess.git", "93cbff11d7b02903e532c7b64207bc12f19b79c7") silex/scalacOptions ~= (_.filterNot(Set("-Wvalue-discard")))
lazy val root = Project( lazy val root = Project(
id = "lisa", id = "lisa",
...@@ -100,4 +102,4 @@ lazy val examples = Project( ...@@ -100,4 +102,4 @@ lazy val examples = Project(
) )
.settings(commonSettings) .settings(commonSettings)
.settings(commonSettings3) .settings(commonSettings3)
.dependsOn(root) .dependsOn(root)
\ No newline at end of file
...@@ -71,10 +71,6 @@ object Example extends lisa.Main { ...@@ -71,10 +71,6 @@ object Example extends lisa.Main {
val inductiveSet = DEF(x) --> in(∅, x) /\ forall(y, in(y, x) ==> in(succ(y), x)) val inductiveSet = DEF(x) --> in(∅, x) /\ forall(y, in(y, x) ==> in(succ(y), x))
show show
*/ */
/* /*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment