Skip to content

Commit 6b4e531

Browse files
authored
Merge pull request #110 from cucumber/renovate/cucumber.version
Update cucumber.version to v6.4.0
2 parents cc536fc + 8c203a9 commit 6b4e531

File tree

9 files changed

+29
-9
lines changed

9 files changed

+29
-9
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
1313

1414
### Changed
1515

16+
- [Core] Update `cucumber-core` dependency to [6.4.0](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
17+
1618
### Deprecated
1719

1820
### Removed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The minor version might differ because Cucumber Scala may add Scala-related feat
1717

1818
| Cucumber Scala version | Cucumber version | Scala versions |
1919
|------------------------|------------------|------------------|
20-
| 6.3.0 | 6.3.0 | 2.11, 2.12, 2.13 |
20+
| 6.4.0 | 6.4.0 | 2.11, 2.12, 2.13 |
2121
| 5.7.0 | 5.7.0 | 2.11, 2.12, 2.13 |
2222
| 4.7.1 | 4.7.1 | 2.11, 2.12, 2.13 |
2323

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm-scala</artifactId>
7-
<version>6.3.1-SNAPSHOT</version>
7+
<version>6.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>scala-examples</artifactId>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<artifactId>cucumber-jvm-scala</artifactId>
4-
<version>6.3.1-SNAPSHOT</version>
4+
<version>6.4.0-SNAPSHOT</version>
55
<packaging>pom</packaging>
66
<name>Cucumber-JVM: Scala</name>
77
<description>Cucumber for Scala</description>
@@ -20,7 +20,7 @@
2020
<minimum.maven.version>3.3</minimum.maven.version>
2121
<outputDirectory>${project.build.directory}</outputDirectory>
2222
<scala-maven-plugin.version>4.4.0</scala-maven-plugin.version>
23-
<cucumber.version>6.3.0</cucumber.version>
23+
<cucumber.version>6.4.0</cucumber.version>
2424
<gherkin.version>14.2.0</gherkin.version>
2525
<groovy.version>2.5.13</groovy.version>
2626
<jackson-databind.version>2.11.1</jackson-databind.version>

scala/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm-scala</artifactId>
7-
<version>6.3.1-SNAPSHOT</version>
7+
<version>6.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-scala-aggregator</artifactId>

scala/scala_2.11/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-scala-aggregator</artifactId>
7-
<version>6.3.1-SNAPSHOT</version>
7+
<version>6.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-scala_2.11</artifactId>
@@ -59,6 +59,14 @@
5959
</testResource>
6060
</testResources>
6161
<plugins>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-compiler-plugin</artifactId>
65+
<configuration>
66+
<source>1.8</source>
67+
<target>1.8</target>
68+
</configuration>
69+
</plugin>
6270
<!-- Extra Sources for Scala 2.11 -->
6371
<plugin>
6472
<groupId>org.codehaus.mojo</groupId>
@@ -82,6 +90,7 @@
8290
<artifactId>scala-maven-plugin</artifactId>
8391
<configuration>
8492
<args>
93+
<arg>-target:jvm-1.8</arg>
8594
<arg>-deprecation</arg>
8695
<arg>-feature</arg>
8796
<!-- Allow definition of implicit functions called views -->

scala/scala_2.12/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-scala-aggregator</artifactId>
7-
<version>6.3.1-SNAPSHOT</version>
7+
<version>6.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-scala_2.12</artifactId>
@@ -73,6 +73,7 @@
7373
<artifactId>scala-maven-plugin</artifactId>
7474
<configuration>
7575
<args>
76+
<arg>-target:jvm-1.8</arg>
7677
<!-- Emit warning and location for usages of deprecated APIs. -->
7778
<arg>-deprecation</arg>
7879
<!-- Emit warning and location for usages of features that should be imported explicitly. -->

scala/scala_2.13/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-scala-aggregator</artifactId>
7-
<version>6.3.1-SNAPSHOT</version>
7+
<version>6.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-scala_2.13</artifactId>
@@ -70,6 +70,7 @@
7070
<configuration>
7171
<!-- https://nathankleyn.com/2019/05/13/recommended-scalac-flags-for-2-13/ -->
7272
<args>
73+
<arg>-target:jvm-1.8</arg>
7374
<!-- Emit warning and location for usages of deprecated APIs. -->
7475
<arg>-deprecation</arg>
7576
<!-- Explain type errors in more detail. -->

scala/sources/src/main/scala/io/cucumber/scala/AbstractGlueDefinition.scala

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
package io.cucumber.scala
22

33
import java.lang.reflect.InvocationTargetException
4+
import java.util.Optional
45

5-
import io.cucumber.core.backend.{CucumberInvocationTargetException, Located}
6+
import io.cucumber.core.backend.{CucumberInvocationTargetException, Located, SourceReference}
67

78
import scala.util.{Failure, Try}
89

910
trait AbstractGlueDefinition extends Located {
1011

1112
val location: StackTraceElement
1213

14+
lazy val sourceReference: SourceReference = SourceReference.fromStackTraceElement(location)
15+
1316
override def getLocation(): String = {
1417
location.toString
1518
}
@@ -18,6 +21,10 @@ trait AbstractGlueDefinition extends Located {
1821
location.getFileName != null && location.getFileName == stackTraceElement.getFileName
1922
}
2023

24+
override def getSourceReference(): Optional[SourceReference] = {
25+
Optional.of(sourceReference)
26+
}
27+
2128
/**
2229
* Executes the block of code and handle failures in the way asked by Cucumber specification: that is throwing a CucumberInvocationTargetException.
2330
*/

0 commit comments

Comments
 (0)