scala 3.0.0-RC2

Author: gekomad

README.md

@@ -5,7 +5,10 @@ Scala regex collection
 
 Scala-regex-collection is a pure scala regex collection
 ## Add the library to your project
-`libraryDependencies += "com.github.gekomad" %% "scala-regex-collection" % "1.0.1"`
+
+The latest version of the library is available for Scala 2.12, 2.13 and 3.0.
+
+`libraryDependencies += "com.github.gekomad" %% "scala-regex-collection" % "2.0.0"`
 
  ## Using Library
 

build.sbt

@@ -1,25 +1,13 @@
 name := "scala-regex-collection"
 
-version := "1.0.1"
+version := "2.0.0"
 
-scalaVersion := "2.13.1"
+scalaVersion := "3.0.0-RC2"
 organization := "com.github.gekomad"
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0-M2" % Test
+libraryDependencies += "org.typelevel" %% "discipline-scalatest" % "2.1.3" % Test
+crossScalaVersions := Seq("2.12.8", "2.13.5", "3.0.0-RC2")
 
-crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.12.8", "2.13.0", "2.13.1")
-
-scalacOptions ++= Seq(
-  "-deprecation",
-  "-encoding", "UTF-8",
-  "-language:postfixOps",
-  "-feature",
-  "-unchecked", // Enable additional warnings where generated code depends on assumptions.
-  "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access.
-  "-Ywarn-dead-code", // Warn when dead code is identified.
-  "-explaintypes", // Explain type errors in more detail.
-  "-Xfatal-warnings"
-)
+scalacOptions ++= Seq("-deprecation", "-language:postfixOps", "-feature", "-unchecked", "-Xfatal-warnings")
 
 publishTo := sonatypePublishTo.value
-

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.3.6
+sbt.version=1.5.0-RC2

src/main/scala/com/github/gekomad/regexcollection/Validator.scala

@@ -142,7 +142,7 @@ object Collection {
         def extractToList(mi: Regex.MatchIterator, acc: List[String]): List[String] =
           if (!mi.hasNext) acc
           else
-            extractToList(mi, acc ::: List(mi.next))
+            extractToList(mi, acc ::: List(mi.next()))
 
         extractToList(r.findAllIn(a), Nil)
       }

src/test/scala/ReadFile.scala

@@ -8,9 +8,9 @@ class ReadFile extends AnyFunSuite {
     import com.github.gekomad.regexcollection.Validate.findAll
     import java.io.File
     import scala.util.Try
-    def getListOfFiles(dir: String)(f : File => Unit): Unit = {
-      def go(dir: File): Unit= dir match {
-        case d if d.exists && d.isDirectory && d.canRead=>
+    def getListOfFiles(dir: String)(f: File => Unit): Unit = {
+      def go(dir: File): Unit = dir match {
+        case d if d.exists && d.isDirectory && d.canRead =>
           val files = d.listFiles.filter(a => a.canRead && a.isFile).toList
           val dirs  = dir.listFiles.filter(_.isDirectory).toList
           files.foreach(f)
@@ -20,9 +20,9 @@ class ReadFile extends AnyFunSuite {
       go(new File(dir))
     }
 
-   getListOfFiles("/") { filename =>
+    getListOfFiles("/") { filename =>
       Try {
-        for (line <- Source.fromFile(filename).getLines) {
+        for (line <- Source.fromFile(filename).getLines()) {
           findAll[Email](line).foreach(a => println(s"$filename: [Email] $a"))
           findAll[Time24](line).foreach(a => println(s"$filename: [Time24] $a"))
           findAll[ApacheError](line).foreach(a => println(s"$filename: [ApacheError] $a"))
@@ -38,9 +38,9 @@ class ReadFile extends AnyFunSuite {
           findAll[DMY3](line).foreach(a => println(s"$filename: [DMY3] $a"))
           findAll[UUID](line).foreach(a => println(s"$filename: [UUID] $a"))
           findAll[Youtube](line).foreach(a => println(s"$filename: [Youtube] $a"))
-
         }
       }
+      ()
     }
   }