Cross-build with Scala 2.13.0

Author: romac

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.0.8" % "test,it"
 
 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.12.8",
+  crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0")
 )
 
 lazy val root = (project in file(".")).

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/extensions/tip/Parser.scala

@@ -207,7 +207,8 @@ class Parser(lexer: Lexer) extends parser.Parser(lexer) {
       if ((funDec +: funDecs).exists(_.isLeft)) {
         DefineFunsRecPar(funDec +: funDecs, body +: bodies)
       } else {
-        DefineFunsRec((funDec +: funDecs).map(_.right.get), body +: bodies)
+        val funsRec = (funDec +: funDecs).collect { case Right(funDec) => funDec }
+        DefineFunsRec(funsRec, body +: bodies)
       }
 
     case LT.DeclareDatatypes =>

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.flatMap(c => if (c == '"') "\"\"" else c.toString))
     print("\"")
   }