Skip to content

Commit b8e75d3

Browse files
committed
Merge remote-tracking branch 'origin/main' into v7.x
2 parents a40e1c2 + cc5909a commit b8e75d3

File tree

6 files changed

+28
-12
lines changed

6 files changed

+28
-12
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
os: [ ubuntu-latest ]
1616
java:
17-
- 1.8
17+
- 8.0
1818
- 11
1919
runs-on: ${{ matrix.os }}
2020
steps:
@@ -31,9 +31,10 @@ jobs:
3131
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
3232

3333
- name: Set up JDK
34-
uses: actions/setup-java@v1
34+
uses: actions/setup-java@v2
3535
with:
3636
java-version: ${{ matrix.java }}
37+
distribution: 'adopt'
3738

3839
- name: Formatting check
3940
run: sbt scalafmtCheckAll
@@ -64,9 +65,10 @@ jobs:
6465
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
6566

6667
- name: Set up JDK
67-
uses: actions/setup-java@v1
68+
uses: actions/setup-java@v2
6869
with:
6970
java-version: ${{ matrix.java }}
71+
distribution: 'adopt'
7072

7173
- name: Version check
7274
run: sbt "project cucumberScala" versionPolicyCheck

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
2222

2323
### Fixed
2424

25+
## [6.10.3] (2021-04-15)
26+
27+
### Changed
28+
29+
- [Core] Updated `cucumber-core` dependency to [6.10.3](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
30+
31+
## [6.10.2] (2021-03-16)
32+
33+
### Changed
34+
35+
- [Core] Updated `cucumber-core` dependency to [6.10.2](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
36+
2537
## [6.10.1] (2021-03-09)
2638

2739
### Changed
@@ -278,7 +290,9 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
278290
- [Build] Update Scala versions to 2.11.12 and 2.12.7 ([#11](https://github.com/cucumber/cucumber-jvm-scala/issues/11) Arturas Smorgun)
279291

280292
<!-- Releases -->
281-
[Unreleased]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.1...main
293+
[Unreleased]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.3...main
294+
[6.10.3]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.2...v6.10.3
295+
[6.10.2]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.1...v6.10.2
282296
[6.10.1]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.10.0...v6.10.1
283297
[6.10.0]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.9.1...v6.10.0
284298
[6.9.1]: https://github.com/cucumber/cucumber-jvm-scala/compare/v6.9.0...v6.9.1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The minor version might differ because Cucumber Scala may add Scala-related feat
1717

1818
| Cucumber Scala version | Cucumber version | Scala versions |
1919
|------------------------|------------------|------------------|
20-
| 6.10.1 | 6.10.1 | 2.11, 2.12, 2.13 |
20+
| 6.10.3 | 6.10.3 | 2.11, 2.12, 2.13 |
2121
| 5.7.0 | 5.7.0 | 2.11, 2.12, 2.13 |
2222
| 4.7.1 | 4.7.1 | 2.11, 2.12, 2.13 |
2323

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ scalaVersion := scala213
3939

4040
// Library versions
4141

42-
val cucumberVersion = "6.10.1"
43-
val jacksonVersion = "2.12.2"
44-
val mockitoScalaVersion = "1.16.29"
42+
val cucumberVersion = "6.10.3"
43+
val jacksonVersion = "2.12.3"
44+
val mockitoScalaVersion = "1.16.37"
4545
val junitVersion = "4.13.2"
4646

4747
// Projects and settings

docs/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
To use Cucumber Scala in your project, add the following line to your `build.sbt`:
88

99
```scala
10-
libraryDependencies += "io.cucumber" %% "cucumber-scala" % "6.10.1" % Test
10+
libraryDependencies += "io.cucumber" %% "cucumber-scala" % "6.10.3" % Test
1111
```
1212

1313
### Maven
@@ -18,7 +18,7 @@ To use Cucumber Scala in your project, add the following dependency to your `pom
1818
<dependency>
1919
<groupId>io.cucumber</groupId>
2020
<artifactId>cucumber-scala_2.12</artifactId>
21-
<version>6.10.1</version>
21+
<version>6.10.3</version>
2222
<scope>test</scope>
2323
</dependency>
2424
```

project/build-dependencies.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
libraryDependencies += "io.cucumber" % "cucumber-core" % "6.10.1"
2-
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2"
1+
libraryDependencies += "io.cucumber" % "cucumber-core" % "6.10.3"
2+
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3"

0 commit comments

Comments
 (0)