Skip to content

Commit 2bd6c91

Browse files
authored
Merge pull request #149 from cucumber/java11
Build & test using JDK11
2 parents 34cdfb1 + 580811d commit 2bd6c91

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: scala
22
os: linux
33
jdk:
4+
- openjdk11
45
- openjdk8
56

67
cache:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
1212
### Added
1313

1414
- [Build] Setup formatting using `scalafmt`
15+
- [CI] Build & test on both JDK 8 and 11
1516

1617
### Changed
1718

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ val junitVersion = "4.13.1"
4747

4848
lazy val commonSettings = Seq(
4949
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
50-
scalacOptions += "-target:jvm-1.8",
5150
scalacOptions ++= {
5251
CrossVersion.partialVersion(scalaVersion.value) match {
5352
case Some((2, 11)) => ScalacOptions.scalacOptions211

cucumber-scala/src/test/scala/io/cucumber/scala/ScalaDslStepsTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class ScalaDslStepsTest {
7474
glue.registry.stepDefinitions.head,
7575
"""Oh boy, (\d+) (\s+) cukes""",
7676
"ScalaDslStepsTest.scala:65",
77-
Array(new java.lang.Integer(5), "green"),
77+
Array(java.lang.Integer.valueOf(5), "green"),
7878
thenumber == 5 && thecolour == "green"
7979
)
8080
}
@@ -185,7 +185,7 @@ class ScalaDslStepsTest {
185185
Glue.registry.stepDefinitions.head,
186186
"""Oh boy, (\d+) (\s+) cukes""",
187187
"ScalaDslStepsTest.scala:178",
188-
Array(new java.lang.Integer(5), "green"),
188+
Array(java.lang.Integer.valueOf(5), "green"),
189189
thenumber == 5 && thecolour == "green"
190190
)
191191
}

project/ScalacOptions.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ object ScalacOptions {
5656
"-encoding",
5757
"UTF-8", // yes, this is 2 args
5858
"-feature",
59-
"-language:implicitConversions"
59+
"-language:implicitConversions",
60+
"-target:jvm-1.8"
6061
)
6162

6263
}

0 commit comments

Comments
 (0)