cross publish to scala 2.13

Author: OlegYch

build.sbt

@@ -2,13 +2,16 @@ organization := "tv.cntt"
 name         := "scaposer"
 version      := "1.11.1-SNAPSHOT"
 
-scalaVersion       := "2.12.6"
-crossScalaVersions := Seq("2.12.6", "2.11.12")
+scalaVersion       := "2.12.8"
+crossScalaVersions := Seq("2.13.0", "2.12.8", "2.11.12")
 
 scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked")
 javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
 
 // Scala 2.11+ core does not include scala.util.parsing.combinator
-libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1"
+libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
 
-libraryDependencies += "org.specs2" %% "specs2-core" % "4.3.3" % "test"
+libraryDependencies += "org.specs2" %% "specs2-core" % "4.6.0" % "test"
+
+//https://github.com/scala/scala-parser-combinators/issues/197
+fork in Test := true

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.18

src/main/scala/scaposer/I18n.scala

@@ -129,7 +129,8 @@ case class I18n(ctxSingularToStrs: Map[(String, String), Seq[String]]) {
 
       case Some(strs) =>
         val header = strs.head
-        header.lines.find(_.startsWith("Plural-Forms")) match {
+        //linesIterator is undeprecated in 2.13 to avoid ambiguity with lines method in JDK11
+        header.linesIterator.find(_.startsWith("Plural-Forms")) match {
           case None => None
 
           case Some(line) =>

src/main/scala/scaposer/PluralIndexExpressionParser.scala

@@ -50,15 +50,15 @@ object PluralIndexExpressionParser extends RegexParsers {
     private def value: Parser[Long => Long] = number | n | (openBrace ~> subexpr <~ closeBrace)
 
     private def term: Parser[Long => Long] = value ~ rep(multuply ~ value | divide ~ value | mod ~ value) ^^ {
-      case number ~ list => (number /: list) {
+      case number ~ list => list.foldLeft(number) {
         case (x, `multuply` ~ y) => t: Long => x(t) * y(t)
         case (x, `divide` ~ y) => t: Long => x(t) / y(t)
         case (x, `mod` ~ y) => t: Long => x(t) % y(t)
       }
     }
 
     private def expr: Parser[Long => Long] = term ~ rep(plus ~ term | minus ~ term) ^^ {
-      case number ~ list => (number /: list) {
+      case number ~ list => list.foldLeft(number) {
         case (x, `plus` ~ y) => t: Long => x(t) + y(t)
         case (x, `minus` ~ y) => t: Long => x(t) - y(t)
       }