bump Ammonite version

3 files changed, 16 insertions, 17 deletions

diff --git a/scalalib/src/mill/scalalib/Versions.scala b/scalalib/src/mill/scalalib/Versions.scala
index bfcc5495..6f1c729b 100644
--- a/scalalib/src/mill/scalalib/Versions.scala
+++ b/scalalib/src/mill/scalalib/Versions.scala
@@ -2,7 +2,7 @@ package mill.scalalib
 
 object Versions {
   // Keep synchronized with ammonite dependency in core in build.sc
-  val ammonite = "1.1.2-30-53edc31"
+  val ammonite = "1.3.0"
   // Keep synchronized with zinc dependency in scalalib.worker in build.sc
   val zinc = "1.2.1"
 }
diff --git a/scalalib/src/mill/scalalib/dependency/versions/VersionParser.scala b/scalalib/src/mill/scalalib/dependency/versions/VersionParser.scala
index d85c4276..10aebd73 100644
--- a/scalalib/src/mill/scalalib/dependency/versions/VersionParser.scala
+++ b/scalalib/src/mill/scalalib/dependency/versions/VersionParser.scala
@@ -1,30 +1,30 @@
 package mill.scalalib.dependency.versions
 
-import fastparse.all._
+import fastparse._, NoWhitespace._
 
 private[dependency] object VersionParser {
 
-  private val numberParser =
-    P(CharIn('0' to '9').rep(1).!.map(_.toLong))
-  private val numericPartParser =
-    P(numberParser ~ &(CharIn(".", "-", "+") | End)).rep(min = 1, sep = ".")
+  private def numberParser[_: P] =
+    P(CharIn("0-9").rep(1).!.map(_.toLong))
+  private def numericPartParser[_: P] =
+    P(numberParser ~ &(CharIn(".\\-+") | End)).rep(min = 1, sep = ".")
 
-  private val tokenParser =
+  private def tokenParser[_: P] =
     CharPred(c => c != '.' && c != '-' && c != '+').rep(1).!
-  private val tokenPartParser =
-    tokenParser.rep(sep = CharIn(".", "-"))
+  private def tokenPartParser[_: P] =
+    tokenParser.rep(sep = CharIn(".\\-"))
 
-  private val firstPartParser =
-    P(CharIn(".", "-") ~ tokenPartParser).?
+  private def firstPartParser[_: P] =
+    P(CharIn(".\\-") ~ tokenPartParser).?
 
-  private val secondPartParser =
+  private def secondPartParser[_: P] =
     P("+" ~ tokenPartParser).?
 
-  private val versionParser =
+  private def versionParser[_: P] =
     P(numericPartParser ~ firstPartParser ~ secondPartParser).map {
       case (a, b, c) => (a, b.getOrElse(Seq.empty), c.getOrElse(Seq.empty))
     }
 
   def parse(text: String): Parsed[(Seq[Long], Seq[String], Seq[String])] =
-    versionParser.parse(text)
+    fastparse.parse(text, versionParser(_))
 }
diff --git a/scalalib/test/src/mill/scalalib/dependency/versions/VersionTests.scala b/scalalib/test/src/mill/scalalib/dependency/versions/VersionTests.scala
index 8bc1a992..b916c86f 100644
--- a/scalalib/test/src/mill/scalalib/dependency/versions/VersionTests.scala
+++ b/scalalib/test/src/mill/scalalib/dependency/versions/VersionTests.scala
@@ -29,7 +29,7 @@
 package mill.scalalib.dependency.versions
 
 import utest._
-import fastparse.core.Parsed
+import fastparse.Parsed
 
 object VersionTests extends TestSuite {
 
@@ -120,8 +120,7 @@ object VersionTests extends TestSuite {
       }
       Symbol("parse  9.1-901-1.jdbc4") - {
         assertMatch(VersionParser.parse("9.1-901-1.jdbc4")) {
-          case Parsed
-                .Success((Seq(9, 1), Seq("901", "1", "jdbc4"), Seq()), _) =>
+          case Parsed.Success((Seq(9, 1), Seq("901", "1", "jdbc4"), Seq()), _) =>
         }
       }
       Symbol("parse 1.33.7+build/11.e0f985a") - {