Skip to content

Build & test using JDK11 #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: scala
os: linux
jdk:
- openjdk11
- openjdk8

cache:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
### Added

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

### Changed

Expand Down
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ val junitVersion = "4.13.1"

lazy val commonSettings = Seq(
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
scalacOptions += "-target:jvm-1.8",
scalacOptions ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 11)) => ScalacOptions.scalacOptions211
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class ScalaDslStepsTest {
glue.registry.stepDefinitions.head,
"""Oh boy, (\d+) (\s+) cukes""",
"ScalaDslStepsTest.scala:65",
Array(new java.lang.Integer(5), "green"),
Array(java.lang.Integer.valueOf(5), "green"),
thenumber == 5 && thecolour == "green"
)
}
Expand Down Expand Up @@ -185,7 +185,7 @@ class ScalaDslStepsTest {
Glue.registry.stepDefinitions.head,
"""Oh boy, (\d+) (\s+) cukes""",
"ScalaDslStepsTest.scala:178",
Array(new java.lang.Integer(5), "green"),
Array(java.lang.Integer.valueOf(5), "green"),
thenumber == 5 && thecolour == "green"
)
}
Expand Down
3 changes: 2 additions & 1 deletion project/ScalacOptions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ object ScalacOptions {
"-encoding",
"UTF-8", // yes, this is 2 args
"-feature",
"-language:implicitConversions"
"-language:implicitConversions",
"-target:jvm-1.8"
)

}