scala 2.13 (#18)

lewismj · glibas · commit f6c9af52880c · 2019-06-25T10:32:24.000+01:00
* scala-2.13 compatibility

* Add extra call in travis file and fix RpnCalculator.scala
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,9 @@ jobs:
   - stage: test
     scala: 2.12
     script: mvn test -pl scala/scala_2.12,examples -B
+  - stage: test
+    scala: 2.13
+    script: mvn test -pl scala/scala_2.13,examples -B
   - stage: deploy
     jdk: openjdk8
     script:
diff --git a/examples/src/main/scala/cucumber/examples/scalacalculator/RpnCalculator.scala b/examples/src/main/scala/cucumber/examples/scalacalculator/RpnCalculator.scala
@@ -14,7 +14,7 @@ case class Op(value: String) extends Arg
 case class Val(value: Double) extends Arg
 
 class RpnCalculator {
-  private val stack = new Queue[Double]
+  private val stack = Queue.empty[Double]
 
   private def op(f: (Double, Double) => Double) =
     stack += f(stack.dequeue(), stack.dequeue())
@@ -30,4 +30,4 @@ class RpnCalculator {
   }
 
   def value = stack.head
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
         <mockito.version>1.10.19</mockito.version>
         <scala.2.12.version>2.12.7</scala.2.12.version>
         <scala.2.11.version>2.11.12</scala.2.11.version>
-
+	<scala.2.13.version>2.13.0</scala.2.13.version>
     </properties>
 
     <scm>
@@ -119,6 +119,7 @@
                                 <sourceDirectories>
                                     <sourceDirectory>${basedir}/scala/scala_2.11/target/generated-sources/i18n</sourceDirectory>
                                     <sourceDirectory>${basedir}/scala/scala_2.12/target/generated-sources/i18n</sourceDirectory>
+				    <sourceDirectory>${basedir}/scala/scala_2.13/target/generated-sources/i18n</sourceDirectory>
                                 </sourceDirectories>
                             </configuration>
                         </plugin>
diff --git a/scala/pom.xml b/scala/pom.xml
@@ -13,6 +13,7 @@
 
     <modules>
         <module>scala_2.11</module>
+	<module>scala_2.13</module>
     </modules>
 
     <profiles>
diff --git a/scala/scala_2.13/pom.xml b/scala/scala_2.13/pom.xml
@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.cucumber</groupId>
+        <artifactId>cucumber-scala-aggregator</artifactId>
+        <version>4.4.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>cucumber-scala_2.13</artifactId>
+    <packaging>jar</packaging>
+    <name>Cucumber-JVM: Scala (2.13)</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-compiler</artifactId>
+            <version>${scala.2.13.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${scala.2.13.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>../sources/src/main/scala</sourceDirectory>
+        <testSourceDirectory>../sources/src/test/scala</testSourceDirectory>
+        <testResources>
+          <testResource>
+            <directory>../sources/src/test/resources</directory>
+          </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/scala/sources/src/main/scala/cucumber/api/scala/ScalaDsl.scala b/scala/sources/src/main/scala/cucumber/api/scala/ScalaDsl.scala
diff --git a/scala/sources/src/main/scala/cucumber/runtime/scala/ScalaBackend.scala b/scala/sources/src/main/scala/cucumber/runtime/scala/ScalaBackend.scala
@@ -34,17 +34,15 @@ class ScalaBackend(resourceLoader:ResourceLoader, typeRegistry: TypeRegistry) ex
 
   def getBeforeStepHooks = instances.flatMap(_.beforeStepHooks)
 
-  def disposeWorld() {
-    instances = Nil
-  }
+  def disposeWorld() : Unit  = { instances = Nil }
 
   def getSnippet(step: PickleStep, keyword: String, functionNameGenerator: FunctionNameGenerator) = snippetGenerator.getSnippet(step, keyword, functionNameGenerator)
 
-  def buildWorld() {
+  def buildWorld() : Unit = {
     //I don't believe scala has to do anything to clean out its world
   }
 
-  def loadGlue(glue: Glue, gluePaths: JList[URI]) {
+  def loadGlue(glue: Glue, gluePaths: JList[URI]) : Unit = {
 
     val cl = Thread.currentThread().getContextClassLoader
     val classFinder = new ResourceLoaderClassFinder(resourceLoader, cl)
@@ -70,15 +68,16 @@ class ScalaBackend(resourceLoader:ResourceLoader, typeRegistry: TypeRegistry) ex
       instField.setAccessible(true)
       instField.get(null).asInstanceOf[ScalaDsl]
     }
-    val clsInstances = clsClasses map {_.newInstance()}
+    val clsInstances = clsClasses.map {_.newInstance()}
 
-    instances = objInstances ++ clsInstances
+    instances = objInstances.toSeq ++ clsInstances
 
     getStepDefinitions map {glue.addStepDefinition(_)}
     getBeforeHooks map {glue.addBeforeHook(_)}
     getAfterHooks map  {glue.addAfterHook(_)}
     getAfterStepHooks map  {glue.addAfterStepHook(_)}
     getBeforeStepHooks map  {glue.addBeforeStepHook(_)}
+    ()
   }
 
 }
diff --git a/scala/sources/src/main/scala/cucumber/runtime/scala/ScalaHookDefinition.scala b/scala/sources/src/main/scala/cucumber/runtime/scala/ScalaHookDefinition.scala
@@ -15,13 +15,13 @@ class ScalaHookDefinition(f:Scenario => Unit,
 
   val tagPredicate = new TagPredicate(tags.asJava)
 
-  def getLocation(detail: Boolean) = "TODO: Implement getLocation in similar fashion to ScalaStepDefinition"
+  def getLocation(detail: Boolean)  = "TODO: Implement getLocation in similar fashion to ScalaStepDefinition"
 
-  def execute(scenario: Scenario) { f(scenario) }
+  def execute(scenario: Scenario): Unit = f(scenario) 
 
   def matches(tags: Collection[PickleTag]) = tagPredicate.apply(tags)
 
   def getOrder = order
 
   def isScenarioScoped = false
-}
+}
diff --git a/scala/sources/src/main/scala/cucumber/runtime/scala/ScalaSnippetGenerator.scala b/scala/sources/src/main/scala/cucumber/runtime/scala/ScalaSnippetGenerator.scala
@@ -29,7 +29,7 @@ class ScalaSnippetGenerator extends Snippet {
     def name(clazz: Class[_]) =
       if(clazz.isPrimitive){
         val name = clazz.getName
-        name.charAt(0).toUpper + name.substring(1)
+        s"${name.charAt(0).toUpper}${name.substring(1)}"
       } else
         clazz.getSimpleName
 
