diff --git a/build.sbt b/build.sbt index 5b984ed01dc07a99e12adf882198d16d2a667043..b6f869108558f3886e7df443329f053a0569a631 100644 --- a/build.sbt +++ b/build.sbt @@ -31,13 +31,15 @@ resolvers ++= Seq( "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" ) +val libisabelleVersion = "0.1.2" + libraryDependencies ++= Seq( "org.scala-lang" % "scala-compiler" % "2.11.7", "org.scalatest" %% "scalatest" % "2.2.4" % "test", "com.typesafe.akka" %% "akka-actor" % "2.3.4", - "info.hupel" %% "libisabelle" % "0.1.1", - "info.hupel" %% "libisabelle-setup" % "0.1.1", - "info.hupel" %% "pide-2015" % "0.1.1", + "info.hupel" %% "libisabelle" % libisabelleVersion, + "info.hupel" %% "libisabelle-setup" % libisabelleVersion, + "info.hupel" %% "pide-2015" % libisabelleVersion, "org.ow2.asm" % "asm-all" % "5.0.4", "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.6.0-rc2" ) diff --git a/src/main/scala/leon/solvers/isabelle/IsabelleEnvironment.scala b/src/main/scala/leon/solvers/isabelle/IsabelleEnvironment.scala index 853af8056f581e7ba53e8cfccaf11484d8d0b9fe..4c76f386ba3c69ed8b0c25437894bda2734cd271 100644 --- a/src/main/scala/leon/solvers/isabelle/IsabelleEnvironment.scala +++ b/src/main/scala/leon/solvers/isabelle/IsabelleEnvironment.scala @@ -16,7 +16,7 @@ import leon.purescala.Common._ import leon.solvers._ import leon.utils._ -import edu.tum.cs.isabelle.{impl => impl2015, _} +import edu.tum.cs.isabelle._ import edu.tum.cs.isabelle.api._ import edu.tum.cs.isabelle.setup._ @@ -62,17 +62,17 @@ object IsabelleEnvironment { } val system = setup.flatMap { setup => - val env = new impl2015.Environment(setup.home) - val config = env.Configuration.fromPath(Component.leonBase, "Leon") + val env = Implementations.makeEnvironment(setup.home, classOf[edu.tum.cs.isabelle.impl.Environment]) + val config = Configuration.fromPath(Component.leonBase, "Leon") if (build) { context.reporter.info(s"Building session ...") - if (!System.build(env)(config)) + if (!System.build(env, config)) context.reporter.internalError("Build failed") } context.reporter.info(s"Starting $version instance ...") - System.create(env)(config) + System.create(env, config) } val thy = system.flatMap { system =>