Skip to content

Commit 5b9503e

Browse files
jad-hamzajad-hamza
authored
Merge pull request epfl-lara#1 
2 parents a3ae39a + a2414c9 commit 5b9503e

36 files changed

+156
-167
lines changed

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@ target
22

33
.*.swp
44
*~
5+
6+
.metals
7+
.bloop
8+
.vscode
9+
project/.bloop
10+
project/metals.sbt
11+
project/project

‎.larabot.conf‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
commands = [
2-
"sbt -batch ++2.10.7 test"
3-
"sbt -batch ++2.11.12 test"
4-
"sbt -batch ++2.12.8 test"
5-
"sbt -batch ++2.13.0 test"
6-
"sbt -batch ++2.10.7 it:test"
7-
"sbt -batch ++2.11.12 it:test"
8-
"sbt -batch ++2.12.8 it:test"
9-
"sbt -batch ++2.13.0 it:test"
2+
"sbt -batch ++2.12.13 it:test"
103
]
114

125
trusted = [

‎build.sbt‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ javaOptions in IntegrationTest ++= Seq("-Xss128M")
88

99
fork in IntegrationTest := true
1010

11-
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % "test,it"
11+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.7"
12+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.7" % "test"
13+
1214

1315
logBuffered in IntegrationTest := false
1416

@@ -17,19 +19,13 @@ parallelExecution in Test := true
1719
lazy val commonSettings = Seq(
1820
organization := "com.regblanc",
1921
name := "scala-smtlib",
20-
scalaVersion := "2.12.8",
21-
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0")
22-
)
23-
24-
lazy val publishSettings = Seq(
25-
bintrayOrganization := Some("epfl-lara"),
26-
bintrayRepository := "maven",
22+
scalaVersion := "2.12.13",
23+
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.12.13", "2.13.0", "2.13.5")
2724
)
2825

2926
lazy val root = (project in file(".")).
3027
configs(IntegrationTest).
3128
settings(commonSettings: _*).
32-
settings(publishSettings: _*).
3329
settings(Defaults.itSettings: _*)
3430

3531
publishMavenStyle := true

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.8
1+
sbt.version=1.3.0

‎project/plugins.sbt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
11
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
2-
3-
// avoids warning from sbt-git, see https://github.com/sbt/sbt-git#known-issues
4-
libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.21"
5-
6-
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")

‎src/it/resources/regression/smtlib/solving/cvc4/define_fun2.smt2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(set-option :print-success true)
2-
(set-logic QF_UF)
2+
(set-logic UF)
33
(declare-sort U 0)
44
(declare-fun x0 () U)
55
(declare-fun y0 () U)

‎src/it/resources/regression/smtlib/solving/cvc4/define_fun3.smt2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(set-option :print-success true)
2-
(set-logic QF_UF)
2+
(set-logic UF)
33
(declare-sort U 0)
44
(declare-fun x0 () U)
55
(declare-fun y0 () U)

‎src/it/scala/smtlib/it/ProcessInterpreterTests.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package it
33

44
import scala.sys.process._
55

6-
import org.scalatest.FunSuite
6+
import org.scalatest.funsuite.AnyFunSuite
77

88
import java.io.File
99
import java.io.FileReader
@@ -14,7 +14,7 @@ import printer.RecursivePrinter
1414
import interpreters._
1515

1616

17-
class ProcessInterpreterTests extends FunSuite with TestHelpers {
17+
class ProcessInterpreterTests extends AnyFunSuite with TestHelpers {
1818

1919
//TODO: properly get all interpreters
2020
def interpreters: Seq[Interpreter] = Seq(getZ3Interpreter)

‎src/it/scala/smtlib/it/SmtLibRunnerTests.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package it
33

44
import scala.sys.process._
55

6-
import org.scalatest.FunSuite
6+
import org.scalatest.funsuite.AnyFunSuite
77

88
import java.io.File
99
import java.io.FileReader
@@ -21,7 +21,7 @@ import interpreters._
2121
*
2222
* TODO: proper way to display warning when not all tests are run because of not found executables.
2323
*/
24-
class SmtLibRunnerTests extends FunSuite with TestHelpers {
24+
class SmtLibRunnerTests extends AnyFunSuite with TestHelpers {
2525

2626
filesInResourceDir("regression/smtlib/solving/all", _.endsWith(".smt2")).foreach(file => {
2727
if(isZ3Available) {
@@ -72,7 +72,7 @@ class SmtLibRunnerTests extends FunSuite with TestHelpers {
7272
val lexer = new Lexer(new FileReader(file))
7373
val parser = new Parser(lexer)
7474

75-
for(expected <- scala.io.Source.fromFile(want).getLines) {
75+
for(expected <- scala.io.Source.fromFile(want).getLines()) {
7676
val cmd = parser.parseCommand
7777
assert(cmd !== null)
7878
val res: String = interpreter.eval(cmd).toString

‎src/it/scala/smtlib/it/TestHelpers.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package it
33

44
import scala.sys.process._
55

6-
import org.scalatest.FunSuite
6+
import org.scalatest.funsuite.AnyFunSuite
77

88
import java.io.File
99
import java.io.FileReader

0 commit comments

Comments
 (0)