Cross compile to Scala 3.0.0-M1

Author: gaeljw

CHANGELOG.md

@@ -13,6 +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
 
 ### Changed
 

build.sbt

@@ -33,6 +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"
 
 scalaVersion := scala213
 
@@ -52,9 +53,11 @@ lazy val commonSettings = Seq(
       case Some((2, 11)) => ScalacOptions.scalacOptions211
       case Some((2, 12)) => ScalacOptions.scalacOptions212
       case Some((2, 13)) => ScalacOptions.scalacOptions213
+      case Some((3, 0)) => ScalacOptions.scalacOptions3
       case _             => Seq()
     }
-  }
+  },
+  scalacOptions ++= { if (isDotty.value) Seq("-source:3.0") else Nil }
 )
 
 lazy val root = (project in file("."))
@@ -76,10 +79,11 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
       "io.cucumber" % "cucumber-core" % cucumberVersion,
       // Users have to provide it (for JacksonDefaultDataTableTransformer)
       "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion % Provided,
-      "com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion % Provided,
+      ("com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion % Provided).withDottyCompat(scalaVersion.value),
+
       "junit" % "junit" % junitVersion % Test,
       "io.cucumber" % "cucumber-junit" % cucumberVersion % Test,
-      "org.mockito" %% "mockito-scala" % mockitoScalaVersion % Test
+      ("org.mockito" %% "mockito-scala" % mockitoScalaVersion % Test).withDottyCompat(scalaVersion.value)
     ),
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
@@ -103,7 +107,7 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
       Seq(file)
     }.taskValue
   )
-  .jvmPlatform(scalaVersions = Seq(scala213, scala212, scala211))
+  .jvmPlatform(scalaVersions = Seq(scala3, scala213, scala212, scala211))
 
 // Examples project
 lazy val examples = (projectMatrix in file("examples"))
@@ -117,7 +121,7 @@ lazy val examples = (projectMatrix in file("examples"))
     publishArtifact := false
   )
   .dependsOn(cucumberScala % Test)
-  .jvmPlatform(scalaVersions = Seq(scala213, scala212))
+  .jvmPlatform(scalaVersions = Seq(scala3, scala213, scala212))
 
 // Release & Publish
 

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

@@ -16,7 +16,7 @@ class GlueAdaptor(glue: Glue) {
 
     // If the registry is not consistent, this indicates a mistake in the users definition and we want to let him know.
     registry.checkConsistency().left.foreach {
-      ex: IncorrectHookDefinitionException =>
+      (ex: IncorrectHookDefinitionException) =>
         throw ex
     }
 

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
     }
 

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

@@ -1155,7 +1155,8 @@ private[scala] trait StepDsl extends BaseScalaDsl {
      *
       **/
     def apply(f: => Unit): Unit = {
-      apply(() => f)
+      val fun0 = () => f
+      apply(fun0)
     }
 
     def apply(fun: Fun0): Unit = {

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(s)
-  implicit def value(v: Double) = 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

project/I18nGenerator.scala

@@ -16,7 +16,7 @@ object I18nGenerator {
   private def keywordVal(kw: String): String = {
     val keyworkValName = java.text.Normalizer
       .normalize(kw.replaceAll("[\\s',!]", ""), java.text.Normalizer.Form.NFC)
-    s"""val $keyworkValName = new Step("$keyworkValName")"""
+    s"""  val $keyworkValName = new Step("$keyworkValName")"""
   }
 
   private def traitCode(language: String): String = {

project/ScalacOptions.scala

@@ -1,5 +1,19 @@
 object ScalacOptions {
 
+  val scalacOptions3 = Seq(
+    "-rewrite",
+    "-deprecation", // Emit warning and location for usages of deprecated APIs.
+    "-explain", // Explain type errors in more detail.
+//    "-explaintypes", // Explain type errors in more detail.
+    "-feature", // Emit warning and location for usages of features that should be imported explicitly.
+    "-language:existentials", // Existential types (besides wildcard types) can be written and inferred
+    "-language:experimental.macros", // Allow macro definition (besides implementation and application)
+    "-language:higherKinds", // Allow higher-kinded types
+    "-language:implicitConversions", // Allow definition of implicit functions called views
+    "-unchecked", // Enable additional warnings where generated code depends on assumptions.
+    "-Xfatal-warnings" // Fail the compilation if there are any warnings.
+  )
+
   // Source: https://nathankleyn.com/2019/05/13/recommended-scalac-flags-for-2-13/
   val scalacOptions213 = Seq(
     "-deprecation", // Emit warning and location for usages of deprecated APIs.

project/plugins.sbt

@@ -4,6 +4,9 @@ addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.6.0")
 // Scalafmt (formatter)
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 
+// Scala 3 (Dotty)
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
+
 // Release
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")