diff --git a/build.sbt b/build.sbt index fe70063a55ffa798d09509892a879a05f98ecc33..b63857e10c6ab502311a06054cf485a2cee8e468 100644 --- a/build.sbt +++ b/build.sbt @@ -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, @@ -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", @@ -100,4 +102,4 @@ lazy val examples = Project( ) .settings(commonSettings) .settings(commonSettings3) - .dependsOn(root) \ No newline at end of file + .dependsOn(root) diff --git a/lisa-examples/src/main/scala/Example.scala b/lisa-examples/src/main/scala/Example.scala index 3e504167f400f5debc479ebd2d3e626a653c5e51..9010e489fdc450cb6d91e86488f540561eba1867 100644 --- a/lisa-examples/src/main/scala/Example.scala +++ b/lisa-examples/src/main/scala/Example.scala @@ -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 - - - - */ /*