Minor changes and upgrade to Scala 2.13.1

Author: jad-hamza

.gitignore

@@ -2,3 +2,5 @@ target
 
 .*.swp
 *~
+
+.metals

build.sbt

@@ -14,7 +14,7 @@ javaOptions in IntegrationTest ++= Seq("-Xss128M")
 
 fork in IntegrationTest := true
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test,it"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0-RC3" % "test"
 
 logBuffered in IntegrationTest := false
 
@@ -23,8 +23,8 @@ parallelExecution in Test := true
 lazy val commonSettings = Seq(
   organization := "com.regblanc",
   name := "scala-smtlib",
-  scalaVersion := "2.11.8",
-  crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.1")
+  scalaVersion := "2.13.1",
+  crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.1", "2.13.1")
 )
 
 lazy val root = (project in file(".")).

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.7
+sbt.version=1.3.3

project/plugins.sbt

@@ -1,4 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
-
-// avoids warning from sbt-git, see https://github.com/sbt/sbt-git#known-issues
-libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.21"
+addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")

src/main/scala/smtlib/common/Binary.scala

@@ -16,7 +16,7 @@ class Binary private(val digits: List[Boolean]) {
 
   def toLongBits: Long = {
     val allReversedBits: List[Boolean] = digits.take(64).reverse.padTo(64, false)
-    allReversedBits.foldRight(0l)((bit, bits) => ((bits<<1) | (if(bit) 1 else 0)))
+    allReversedBits.foldRight(0L)((bit, bits) => ((bits<<1) | (if(bit) 1 else 0)))
   }
 
   //transform to a 32 bits integer, respecting 2 complements

src/main/scala/smtlib/common/Hexadecimal.scala

@@ -113,7 +113,7 @@ object Hexadecimal {
       while(i < 8) {
         val end = rest & 15
         rest = rest >> 4
-        repr = toDigit(end) + repr
+        repr = s"${toDigit(end)}$repr"
         i += 1
       }
 

src/main/scala/smtlib/parser/ParserCommands.scala

@@ -219,7 +219,7 @@ trait ParserCommands { this: ParserCommon with ParserTerms =>
       constructors.append(parseConstructor)
     }
     eat(Tokens.CParen)
-    (name, constructors)
+    (name, constructors.toSeq)
   }
 
   def parseConstructor: Constructor = {

src/main/scala/smtlib/printer/PrintingContext.scala

@@ -103,7 +103,7 @@ class PrintingContext(writer: Writer) {
 
   protected def printString(value: String): Unit = {
     print("\"")
-    print(value.flatMap(c => if (c == '"') "\"\"" else List(c)))
+    print(value.replaceAll("\"", "\"\""))
     print("\"")
   }
 

src/test/scala/smtlib/parser/CommandsResponsesParserTests.scala

@@ -341,7 +341,7 @@ class CommandsResponsesParserTests extends FunSuite {
   /*
    * TODO: the standard requires at least one value, currently we return empty list
    */
-  ignore("get-value response must contains at least one valuation pair") {
+  ignore("get-value response must contain at least one valuation pair") {
     intercept[UnexpectedTokenException] {
       Parser.fromString("()").parseGetValueResponse
     }