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

Author: gaeljw

CHANGELOG.md

@@ -16,15 +16,20 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
 
 ### Changed
 
-- [Build] Use Github Actions instead of Travis CI
-- [Build] Upgrade Scala to 2.12.13 and 2.13.5
-
 ### Deprecated
 
 ### Removed
 
 ### Fixed
 
+## [6.10.1] (2021-03-09)
+
+### Changed
+
+- [Core] Updated `cucumber-core` dependency to [6.10.1](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
+- [Build] Use Github Actions instead of Travis CI
+- [Build] Upgrade Scala to 2.12.13 and 2.13.5
+
 ## [6.10.0] (2021-02-15)
 
 ### Changed
@@ -273,7 +278,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.0...main
+[Unreleased]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.1...main
+[6.10.1]:  https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.0...v6.10.1
 [6.10.0]:  https://github.com/cucumber/cucumber-jvm-scala/compare/v6.9.1...v6.10.0
 [6.9.1]:  https://github.com/cucumber/cucumber-jvm-scala/compare/v6.9.0...v6.9.1
 [6.9.0]:  https://github.com/cucumber/cucumber-jvm-scala/compare/v6.8.2...v6.9.0

Makefile

@@ -35,8 +35,6 @@ update-changelog:
 
 .configure-cukebot-in-docker:
 	[ -f '/home/cukebot/configure' ] && /home/cukebot/configure
-	# Cucumber team provides the passphrase in this variable
-	export PGP_PASSPHRASE="$GPG_SIGNING_KEY_PASSPHRASE"
 .PHONY: .configure-cukebot-in-docker
 
 .release-in-docker: .configure-cukebot-in-docker default update-changelog update-installdoc .commit-and-push-changelog-and-docs

README.md

@@ -17,7 +17,7 @@ The minor version might differ because Cucumber Scala may add Scala-related feat
 
 | Cucumber Scala version | Cucumber version | Scala versions   |
 |------------------------|------------------|------------------|
-| 6.10.0                 | 6.10.0           | 2.11, 2.12, 2.13 |
+| 6.10.1                 | 6.10.1           | 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 |
 

build.sbt

@@ -39,7 +39,7 @@ scalaVersion := scala213
 
 // Library versions
 
-val cucumberVersion = "6.10.0"
+val cucumberVersion = "6.10.1"
 val jacksonVersion = "2.12.2"
 val mockitoScalaVersion = "1.16.29"
 val junitVersion = "4.13.2"
@@ -151,6 +151,9 @@ ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
 Global / publishMavenStyle := true
 Global / publishTo := sonatypePublishToBundle.value
 
+// https://github.com/sbt/sbt-pgp/issues/173
+Global / PgpKeys.gpgCommand := (baseDirectory.value / "gpg.sh").getAbsolutePath
+
 // https://github.com/xerial/sbt-sonatype#using-with-sbt-release-plugin
 releaseCrossBuild := true
 releaseProcess := Seq[ReleaseStep](

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.0" % Test
+libraryDependencies += "io.cucumber" %% "cucumber-scala" % "6.10.1" % 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.0</version>
+    <version>6.10.1</version>
     <scope>test</scope>
 </dependency>
 ```

gpg.sh

@@ -0,0 +1,3 @@
+#! /bin/sh
+
+gpg --passphrase "${GPG_SIGNING_KEY_PASSPHRASE}" --pinentry-mode loopback $@

project/build-dependencies.sbt

@@ -1,2 +1,2 @@
-libraryDependencies += "io.cucumber" % "cucumber-core" % "6.10.0"
+libraryDependencies += "io.cucumber" % "cucumber-core" % "6.10.1"
 libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2"

project/plugins.sbt

@@ -14,5 +14,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
 
 // Publishing
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")