diff --git a/build.sbt b/build.sbt index f4e4569..6268bca 100644 --- a/build.sbt +++ b/build.sbt @@ -38,7 +38,7 @@ scalaVersion := scala213 // Library versions -val cucumberVersion = "7.21.1" +val cucumberVersion = "7.22.0" val jacksonVersion = "2.18.3" val mockitoScalaVersion = "1.17.37" val junitVersion = "4.13.2" diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableCellDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableCellDefinition.scala index f585605..8030548 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableCellDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableCellDefinition.scala @@ -3,6 +3,8 @@ package io.cucumber.scala import io.cucumber.core.backend.ScenarioScoped import io.cucumber.datatable.{DataTableType, TableCellTransformer} +import scala.annotation.nowarn + trait ScalaDataTableCellDefinition[T] extends ScalaDataTableTypeDefinition { val details: ScalaDataTableCellTypeDetails[T] @@ -20,6 +22,7 @@ trait ScalaDataTableCellDefinition[T] extends ScalaDataTableTypeDefinition { } +@nowarn class ScalaScenarioScopedDataTableCellDefinition[T]( override val details: ScalaDataTableCellTypeDetails[T] ) extends ScalaDataTableCellDefinition[T] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableDefinition.scala index 096c20e..edf586a 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableDefinition.scala @@ -3,6 +3,8 @@ package io.cucumber.scala import io.cucumber.core.backend.ScenarioScoped import io.cucumber.datatable.{DataTable, DataTableType, TableTransformer} +import scala.annotation.nowarn + trait ScalaDataTableDefinition[T] extends ScalaDataTableTypeDefinition { val details: ScalaDataTableTableTypeDetails[T] @@ -20,6 +22,7 @@ trait ScalaDataTableDefinition[T] extends ScalaDataTableTypeDefinition { } +@nowarn class ScalaScenarioScopedDataTableDefinition[T]( override val details: ScalaDataTableTableTypeDetails[T] ) extends ScalaDataTableDefinition[T] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableEntryDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableEntryDefinition.scala index a892ef3..68bad38 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableEntryDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableEntryDefinition.scala @@ -1,10 +1,10 @@ package io.cucumber.scala import java.util.{Map => JavaMap} - import io.cucumber.core.backend.ScenarioScoped import io.cucumber.datatable.{DataTableType, TableEntryTransformer} +import scala.annotation.nowarn import scala.jdk.CollectionConverters._ trait ScalaDataTableEntryDefinition[T] extends ScalaDataTableTypeDefinition { @@ -27,6 +27,7 @@ trait ScalaDataTableEntryDefinition[T] extends ScalaDataTableTypeDefinition { } +@nowarn class ScalaScenarioScopedDataTableEntryDefinition[T]( override val details: ScalaDataTableEntryTypeDetails[T] ) extends ScalaDataTableEntryDefinition[T] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalCellDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalCellDefinition.scala index cdc8d98..b1746bb 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalCellDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalCellDefinition.scala @@ -3,6 +3,8 @@ package io.cucumber.scala import io.cucumber.core.backend.ScenarioScoped import io.cucumber.datatable.{DataTableType, TableCellTransformer} +import scala.annotation.nowarn + trait ScalaDataTableOptionalCellDefinition[T] extends ScalaDataTableTypeDefinition { @@ -21,6 +23,7 @@ trait ScalaDataTableOptionalCellDefinition[T] } +@nowarn class ScalaScenarioScopedDataTableOptionalCellDefinition[T]( override val details: ScalaDataTableOptionalCellTypeDetails[T] ) extends ScalaDataTableOptionalCellDefinition[T] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalEntryDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalEntryDefinition.scala index 691777d..aad9481 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalEntryDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalEntryDefinition.scala @@ -1,10 +1,10 @@ package io.cucumber.scala import java.util.{Map => JavaMap} - import io.cucumber.core.backend.ScenarioScoped import io.cucumber.datatable.{DataTableType, TableEntryTransformer} +import scala.annotation.nowarn import scala.jdk.CollectionConverters._ trait ScalaDataTableOptionalEntryDefinition[T] @@ -29,6 +29,7 @@ trait ScalaDataTableOptionalEntryDefinition[T] } +@nowarn class ScalaScenarioScopedDataTableOptionalEntryDefinition[T]( override val details: ScalaDataTableOptionalEntryTypeDetails[T] ) extends ScalaDataTableOptionalEntryDefinition[T] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalRowDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalRowDefinition.scala index 2cd0d45..ee64bbb 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalRowDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalRowDefinition.scala @@ -1,10 +1,10 @@ package io.cucumber.scala import java.util.{List => JavaList} - import io.cucumber.core.backend.ScenarioScoped import io.cucumber.datatable.{DataTableType, TableRowTransformer} +import scala.annotation.nowarn import scala.jdk.CollectionConverters._ trait ScalaDataTableOptionalRowDefinition[T] @@ -30,6 +30,7 @@ trait ScalaDataTableOptionalRowDefinition[T] } +@nowarn class ScalaScenarioScopedDataTableOptionalRowDefinition[T]( override val details: ScalaDataTableOptionalRowTypeDetails[T] ) extends ScalaDataTableOptionalRowDefinition[T] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableRowDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableRowDefinition.scala index 98f9fbe..526a857 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableRowDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableRowDefinition.scala @@ -1,10 +1,10 @@ package io.cucumber.scala import java.util.{List => JavaList} - import io.cucumber.core.backend.ScenarioScoped import io.cucumber.datatable.{DataTableType, TableRowTransformer} +import scala.annotation.nowarn import scala.jdk.CollectionConverters._ trait ScalaDataTableRowDefinition[T] extends ScalaDataTableTypeDefinition { @@ -26,6 +26,7 @@ trait ScalaDataTableRowDefinition[T] extends ScalaDataTableTypeDefinition { } +@nowarn class ScalaScenarioScopedDataTableRowDefinition[T]( override val details: ScalaDataTableRowTypeDetails[T] ) extends ScalaDataTableRowDefinition[T] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableCellTransformerDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableCellTransformerDefinition.scala index 72c8e8b..72edfaf 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableCellTransformerDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableCellTransformerDefinition.scala @@ -1,13 +1,14 @@ package io.cucumber.scala import java.lang.reflect.Type - import io.cucumber.core.backend.{ DefaultDataTableCellTransformerDefinition, ScenarioScoped } import io.cucumber.datatable.TableCellByTypeTransformer +import scala.annotation.nowarn + trait ScalaDefaultDataTableCellTransformerDefinition extends DefaultDataTableCellTransformerDefinition with AbstractDatatableElementTransformerDefinition { @@ -43,6 +44,7 @@ object ScalaDefaultDataTableCellTransformerDefinition { } +@nowarn class ScalaScenarioScopedDataTableCellTransformerDefinition( override val details: ScalaDefaultDataTableCellTransformerDetails ) extends ScalaDefaultDataTableCellTransformerDefinition diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableEntryTransformerDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableEntryTransformerDefinition.scala index 9c5ffce..df5646c 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableEntryTransformerDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultDataTableEntryTransformerDefinition.scala @@ -2,7 +2,6 @@ package io.cucumber.scala import java.lang.reflect.Type import java.util.{Map => JavaMap} - import io.cucumber.core.backend.{ DefaultDataTableEntryTransformerDefinition, ScenarioScoped @@ -12,6 +11,7 @@ import io.cucumber.datatable.{ TableEntryByTypeTransformer } +import scala.annotation.nowarn import scala.jdk.CollectionConverters._ trait ScalaDefaultDataTableEntryTransformerDefinition @@ -53,6 +53,7 @@ object ScalaDefaultDataTableEntryTransformerDefinition { } +@nowarn class ScalaScenarioScopedDataTableEntryTransformerDefinition( override val details: ScalaDefaultDataTableEntryTransformerDetails ) extends ScalaDefaultDataTableEntryTransformerDefinition diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultParameterTransformerDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultParameterTransformerDefinition.scala index 1ae267f..6c06a76 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultParameterTransformerDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDefaultParameterTransformerDefinition.scala @@ -1,13 +1,14 @@ package io.cucumber.scala import java.lang.reflect.Type - import io.cucumber.core.backend.{ DefaultParameterTransformerDefinition, ScenarioScoped } import io.cucumber.cucumberexpressions.ParameterByTypeTransformer +import scala.annotation.nowarn + trait ScalaDefaultParameterTransformerDefinition extends DefaultParameterTransformerDefinition with AbstractGlueDefinition { @@ -38,6 +39,7 @@ object ScalaDefaultParameterTransformerDefinition { } +@nowarn class ScalaScenarioScopedDefaultParameterTransformerDefinition( override val details: ScalaDefaultParameterTransformerDetails ) extends ScalaDefaultParameterTransformerDefinition diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDocStringTypeDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDocStringTypeDefinition.scala index 7d6e5ee..92f5f52 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDocStringTypeDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDocStringTypeDefinition.scala @@ -4,6 +4,8 @@ import io.cucumber.core.backend.{DocStringTypeDefinition, ScenarioScoped} import io.cucumber.docstring.DocStringType import io.cucumber.docstring.DocStringType.Transformer +import scala.annotation.nowarn + abstract class ScalaDocStringTypeDefinition[T] extends DocStringTypeDefinition with AbstractGlueDefinition { @@ -36,6 +38,7 @@ object ScalaDocStringTypeDefinition { } +@nowarn class ScalaScenarioScopedDocStringTypeDefinition[T]( override val details: ScalaDocStringTypeDetails[T] ) extends ScalaDocStringTypeDefinition[T] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaHookDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaHookDefinition.scala index c6d0295..f693f4d 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaHookDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaHookDefinition.scala @@ -2,6 +2,8 @@ package io.cucumber.scala import io.cucumber.core.backend.{HookDefinition, ScenarioScoped, TestCaseState} +import scala.annotation.nowarn + trait ScalaHookDefinition extends HookDefinition with AbstractGlueDefinition { val hookDetails: ScalaHookDetails @@ -33,6 +35,7 @@ object ScalaHookDefinition { } +@nowarn class ScalaScenarioScopedHookDefinition( override val hookDetails: ScalaHookDetails ) extends ScalaHookDefinition diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaParameterTypeDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaParameterTypeDefinition.scala index 8db58a7..ec6ce32 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaParameterTypeDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaParameterTypeDefinition.scala @@ -3,6 +3,7 @@ package io.cucumber.scala import io.cucumber.core.backend.{ParameterTypeDefinition, ScenarioScoped} import io.cucumber.cucumberexpressions.{CaptureGroupTransformer, ParameterType} +import scala.annotation.nowarn import scala.jdk.CollectionConverters._ trait ScalaParameterTypeDefinition[R] @@ -42,6 +43,7 @@ object ScalaParameterTypeDefinition { } +@nowarn class ScalaScenarioScopedParameterTypeDefinition[R]( override val details: ScalaParameterTypeDetails[R] ) extends ScalaParameterTypeDefinition[R] diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaStepDefinition.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaStepDefinition.scala index 189478e..8225411 100644 --- a/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaStepDefinition.scala +++ b/cucumber-scala/src/main/scala/io/cucumber/scala/ScalaStepDefinition.scala @@ -2,9 +2,9 @@ package io.cucumber.scala import java.lang.reflect.{Type => JType} import java.util.{List => JList} - import io.cucumber.core.backend.{ParameterInfo, ScenarioScoped, StepDefinition} +import scala.annotation.nowarn import scala.jdk.CollectionConverters._ trait ScalaStepDefinition extends StepDefinition with AbstractGlueDefinition { @@ -56,6 +56,7 @@ object ScalaStepDefinition { } +@nowarn class ScalaScenarioScopedStepDefinition( override val stepDetails: ScalaStepDetails ) extends ScalaStepDefinition