Merge pull request #11 from wolfendale/scala-3

Cross build for Scala 3

Author: wolfendale

README.md

@@ -2,7 +2,7 @@
 
 A library for creating [scalacheck](https://www.scalacheck.org/) generators from regular expressions
 
-Cross-built for Scala 2.11/2.12/2.13
+Cross-built for Scala 2.12/2.13/3.2
 
 ##### Installation
 

build.sbt

@@ -10,13 +10,17 @@ lazy val root = (project in file("."))
     publishMavenStyle := true,
     publishTo := sonatypePublishToBundle.value,
     sonatypeCredentialHost := "s01.oss.sonatype.org",
-    version := "0.1.3",
-    crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.5"),
+    version := "1.0.0",
+    crossScalaVersions := Seq("2.12.16", "2.13.8", "3.1.0"),
+    scalacOptions ++= Seq(
+      "-Xfatal-warnings"
+    ),
     libraryDependencies ++= Seq(
-      "org.scalacheck" %% "scalacheck" % "1.14.2" % "provided",
-      "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2",
-      "org.scalactic" %% "scalactic" % "3.0.8" % "test",
-      "org.scalatest" %% "scalatest" % "3.0.8" % "test"
+      "org.scalacheck" %% "scalacheck" % "1.17.0" % "provided",
+      "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1",
+      "org.scalactic" %% "scalactic" % "3.2.13" % "test",
+      "org.scalatest" %% "scalatest" % "3.2.13" % "test",
+      "org.scalatestplus" %% "scalacheck-1-16" % "3.2.13.0" % "test"
     )
   )
 

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.5.1
+sbt.version = 1.7.1

src/main/scala/wolfendale/scalacheck/regexp/GenParser.scala

@@ -26,9 +26,9 @@ object GenParser extends RegexParsers with PackratParsers {
     }
 
     // quantifiers
-    val optional   = expression0 <~ "?" ^^ { splitLiteral(_, Optional) }
-    val oneOrMore  = expression0 <~ "+" ^^ { splitLiteral(_, OneOrMore) }
-    val zeroOrMore = expression0 <~ "*" ^^ { splitLiteral(_, ZeroOrMore) }
+    val optional   = expression0 <~ "?" ^^ { splitLiteral(_, Optional.apply) }
+    val oneOrMore  = expression0 <~ "+" ^^ { splitLiteral(_, OneOrMore.apply) }
+    val zeroOrMore = expression0 <~ "*" ^^ { splitLiteral(_, ZeroOrMore.apply) }
 
     val rangeFrom = expression0 ~ ("{" ~> int <~ ",}") ^^ {
       case expr ~ min =>
@@ -58,8 +58,8 @@ object GenParser extends RegexParsers with PackratParsers {
 
   lazy val group: PackratParser[RegularExpression] = {
 
-    lazy val nonCapturingGroup = "(?:" ~> expression <~ ")" ^^ NonCapturingGroup
-    lazy val capturingGroup    = "(" ~> expression <~ ")" ^^ Group
+    lazy val nonCapturingGroup = "(?:" ~> expression <~ ")" ^^ NonCapturingGroup.apply
+    lazy val capturingGroup    = "(" ~> expression <~ ")" ^^ Group.apply
 
     capturingGroup | nonCapturingGroup
   }
@@ -77,15 +77,15 @@ object GenParser extends RegexParsers with PackratParsers {
     }
 
     lazy val lowerAlphaRange: Parser[CharacterClass.Term] = {
-      val c = "[a-z]".r ^^ { _.apply(0) }
+      val c = "[a-z]".r ^^ { _.charAt(0) }
       c ~ ("-" ~> c) ^^ {
         case min ~ max =>
           CharacterClass.CharRange(min, max)
       }
     }
 
     lazy val upperAlphaRange: Parser[CharacterClass.Term] = {
-      val c = "[A-Z]".r ^^ { _.apply(0) }
+      val c = "[A-Z]".r ^^ { _.charAt(0) }
       c ~ ("-" ~> c) ^^ {
         case min ~ max =>
           CharacterClass.CharRange(min, max)
@@ -100,7 +100,7 @@ object GenParser extends RegexParsers with PackratParsers {
     lazy val char: Parser[CharacterClass.Term] = {
       val normalChars = "[^\\]\\\\]".r
       val meta = "\\" | "]" | "-"
-      (("\\" ~> meta) | normalChars | "\\" ~> normalChars) ^^ CharacterClass.Literal
+      (("\\" ~> meta) | normalChars | "\\" ~> normalChars) ^^ CharacterClass.Literal.apply
     }
 
     lazy val characterClassTerm: Parser[CharacterClass.Term] =

src/test/scala/wolfendale/scalacheck/regexp/ASTProcessorSpec.scala

@@ -1,11 +1,12 @@
 package wolfendale.scalacheck.regexp
 
 import org.scalacheck.Gen
-import org.scalatest.prop.PropertyChecks
-import org.scalatest.{MustMatchers, WordSpec}
-import ast._
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
+import wolfendale.scalacheck.regexp.ast._
 
-class ASTProcessorSpec extends WordSpec with MustMatchers with PropertyChecks {
+class ASTProcessorSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyChecks {
 
   ".apply" must {
 

src/test/scala/wolfendale/scalacheck/regexp/GenParserSpec.scala

@@ -1,11 +1,12 @@
 package wolfendale.scalacheck.regexp
 
 import org.scalacheck.{Gen, Shrink}
-import org.scalatest.prop.PropertyChecks
-import org.scalatest.{MustMatchers, WordSpec}
-import ast._
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
+import wolfendale.scalacheck.regexp.ast._
 
-class GenParserSpec extends WordSpec with MustMatchers with PropertyChecks {
+class GenParserSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyChecks {
 
   implicit val noShrinkString: Shrink[String] = Shrink.shrinkAny
   implicit def noShrinkSeq[A]: Shrink[Seq[A]] = Shrink.shrinkAny

src/test/scala/wolfendale/scalacheck/regexp/RegexpGenSpec.scala

@@ -1,10 +1,11 @@
 package wolfendale.scalacheck.regexp
 
 import org.scalacheck.{Arbitrary, Gen, Shrink}
-import org.scalatest.prop.PropertyChecks
-import org.scalatest.{MustMatchers, WordSpec}
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
-class RegexpGenSpec extends WordSpec with MustMatchers with PropertyChecks {
+class RegexpGenSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyChecks {
 
   implicit val arbChar: Arbitrary[Char] = Arbitrary(Gen.alphaNumChar)
   implicit val noShrinkString: Shrink[String] = Shrink.shrinkAny

src/test/scala/wolfendale/scalacheck/regexp/data/GroupSpec.scala

@@ -1,11 +1,12 @@
 package wolfendale.scalacheck.regexp.data
 
 import org.scalacheck.Gen
-import org.scalatest.prop.PropertyChecks
-import org.scalatest.{MustMatchers, WordSpec}
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 import wolfendale.scalacheck.regexp.data.Group._
 
-object Iso extends MustMatchers {
+object Iso extends Matchers {
   implicit class IsoOps[A](val left: Group[A]) extends AnyVal {
     def mustBeIsoTo(right: Group[A]): Unit =
       values(left) mustBe values(right)
@@ -18,7 +19,7 @@ object Iso extends MustMatchers {
   }
 }
 
-class GroupSpec extends WordSpec with MustMatchers with PropertyChecks {
+class GroupSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyChecks {
 
   import Iso._