Merge remote-tracking branch 'origin/main' into v7.x

Author: gaeljw

CHANGELOG.md

@@ -22,6 +22,15 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
 
 ### Fixed
 
+## [6.10.4] (2021-05-14)
+
+### Changed
+
+- [Core] Updated `cucumber-core` dependency to [6.10.4](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
+- [Scala] Upgrade `scala-collection-compat` to 2.4.4
+- [Build] Upgrade `sbt-projectmatrix` to 0.8.0
+- [Build] Upgrade `sbt-version-policy` to 1.0.1
+
 ## [6.10.3] (2021-04-15)
 
 ### Changed
@@ -290,7 +299,8 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
 - [Build] Update Scala versions to 2.11.12 and 2.12.7 ([#11](https://github.com/cucumber/cucumber-jvm-scala/issues/11) Arturas Smorgun)
 
 <!-- Releases -->
-[Unreleased]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.3...main
+[Unreleased]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.4...main
+[6.10.4]:  https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.3...v6.10.4
 [6.10.3]:  https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.2...v6.10.3
 [6.10.2]:  https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.1...v6.10.2
 [6.10.1]:  https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.0...v6.10.1

Makefile

@@ -55,6 +55,7 @@ release:
 	  --volume "${shell pwd}/../secrets/.ssh":/home/cukebot/.ssh \
 	  --volume "${HOME}/.ivy2":/home/cukebot/.ivy2 \
 	  --volume "${HOME}/.cache/coursier":/home/cukebot/.cache/coursier \
+	  --volume "${HOME}/.cache/sbt":/home/cukebot/.cache/sbt \
 	  --env-file "${shell pwd}/../secrets/secrets.list" \
 	  --user 1000 \
 	  --rm \

README.md

@@ -11,15 +11,20 @@ See: https://cucumber.io/support
 
 ## Compatibility matrix
 
-The Cucumber Scala major version matches the Cucumber major version.
+Cucumber Scala has a different release cycle than other Cucumber projects that you might use
+(like _cucumber-junit_).
 
-The minor version might differ because Cucumber Scala may add Scala-related features without waiting for a Cucumber minor version.
+As a rule of thumb, you can assume that latest version of Cucumber Scala targets the latest version
+of Cucumber Core projects.
 
-| Cucumber Scala version | Cucumber version | Scala versions   |
-|------------------------|------------------|------------------|
-| 6.10.3                 | 6.10.3           | 2.11, 2.12, 2.13 |
-| 5.7.0                  | 5.7.0            | 2.11, 2.12, 2.13 |
-| 4.7.1                  | 4.7.1            | 2.11, 2.12, 2.13 |
+The table below shows the compatible versions:
+
+| Cucumber Scala version | Cucumber Core version | Scala versions        |
+|------------------------|-----------------------|-----------------------|
+| 7.x (_upcoming_)       | 6.x                   | 2.11, 2.12, 2.13, 3.0 |
+| 6.x                    | 6.x                   | 2.11, 2.12, 2.13      |
+| 5.x                    | 5.x                   | 2.11, 2.12, 2.13      |
+| 4.x                    | 4.x                   | 2.11, 2.12, 2.13      |
 
 ## Getting started
 

build.sbt

@@ -39,7 +39,7 @@ scalaVersion := scala213
 
 // Library versions
 
-val cucumberVersion = "6.10.3"
+val cucumberVersion = "6.10.4"
 val jacksonVersion = "2.12.3"
 val mockitoScalaVersion = "1.16.37"
 val junitVersion = "4.13.2"
@@ -87,7 +87,7 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, n)) if n <= 12 =>
-          List("org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2")
+          List("org.scala-lang.modules" %% "scala-collection-compat" % "2.4.4")
         case Some((3, 0)) =>
           List("io.github.gaeljw" %% "typetrees" % "0.4.0")
         case _ => Nil

docs/install.md

@@ -7,7 +7,7 @@
 To use Cucumber Scala in your project, add the following line to your `build.sbt`:
 
 ```scala
-libraryDependencies += "io.cucumber" %% "cucumber-scala" % "6.10.3" % Test
+libraryDependencies += "io.cucumber" %% "cucumber-scala" % "6.10.4" % Test
 ```
 
 ### Maven
@@ -18,7 +18,7 @@ To use Cucumber Scala in your project, add the following dependency to your `pom
 <dependency>
     <groupId>io.cucumber</groupId>
     <artifactId>cucumber-scala_2.12</artifactId>
-    <version>6.10.3</version>
+    <version>6.10.4</version>
     <scope>test</scope>
 </dependency>
 ```

project/build-dependencies.sbt

@@ -1,2 +1,2 @@
-libraryDependencies += "io.cucumber" % "cucumber-core" % "6.10.3"
-libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3"
+libraryDependencies += "io.cucumber" % "cucumber-core" % "6.10.4"
+libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.4"

project/plugins.sbt

@@ -1,5 +1,5 @@
 // Cross compilation matrix
-addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.7.0")
+addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.8.0")
 
 // Scala 3 (Dotty)
 addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")
@@ -8,7 +8,7 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 
 // Version policy check
-addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
+addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.1")
 
 // Release
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")