Scala 3.0.0-M2

Author: gaeljw

CHANGELOG.md

@@ -13,7 +13,7 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
 
 - [Build] Setup formatting using `scalafmt`
 - [CI] Build & test on both JDK 8 and 11 
-- [Build] Cross compilation with Scala 3.0.0-M1
+- [Build] Cross compilation with Scala 3.0.0-M2
 
 ### Changed
 

build.sbt

@@ -33,7 +33,7 @@ ThisBuild / homepage := Some(
 val scala211 = "2.11.12"
 val scala212 = "2.12.12"
 val scala213 = "2.13.3"
-val scala3 = "3.0.0-M1"
+val scala3 = "3.0.0-M2"
 
 scalaVersion := scala213
 
@@ -56,8 +56,7 @@ lazy val commonSettings = Seq(
       case Some((3, 0)) => ScalacOptions.scalacOptions3
       case _             => Seq()
     }
-  },
-  scalacOptions ++= { if (isDotty.value) Seq("-source:3.0") else Nil }
+  }
 )
 
 lazy val root = (project in file("."))

cucumber-scala/src/main/scala/io/cucumber/scala/Implicits.scala

@@ -33,7 +33,7 @@ object Implicits {
       table
         .asMaps[K, V](evK.runtimeClass, evV.runtimeClass)
         .asScala
-        .map(_.asScala.map(nullToNone(_)).toMap)
+        .map(_.asScala.map(nullToNone).toMap)
         .toSeq
     }
 
@@ -79,7 +79,7 @@ object Implicits {
       table
         .asMap[K, V](evK.runtimeClass, evV.runtimeClass)
         .asScala
-        .map(nullToNone(_))
+        .map(nullToNone)
         .toMap
     }
 
@@ -172,7 +172,7 @@ object Implicits {
           classOf[java.util.Map[String, String]]
         )
         .asScala
-        .map { case (k, v) => (k, v.asScala.map(nullToNone(_)).toMap) }
+        .map { case (k, v) => (k, v.asScala.map(nullToNone).toMap) }
         .toMap
     }
 

examples/src/main/scala/cucumber/examples/scalacalculator/RpnCalculator.scala

@@ -5,8 +5,8 @@ import scala.collection.mutable.Queue
 sealed trait Arg
 
 object Arg {
-  implicit def op(s:String): Op = Op(s)
-  implicit def value(v:Double): Val = Val(v)
+  implicit def op(s: String): Op = Op(s)
+  implicit def value(v: Double): Val = Val(v)
 }
 
 case class Op(value: String) extends Arg