Skip to content

Commit 466226b

Browse files
committed
Merge branch 'master' into update/scalacheck-shapeless_1.14-1.2.4
2 parents 79631cb + b209f39 commit 466226b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

.mergify.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
pull_request_rules:
2+
- name: Automatic merge scala-steward PRs when CI is passing
3+
conditions:
4+
- author=scala-steward
5+
- status-success=continuous-integration/travis-ci/pr
6+
- body~=labels:.*semver-patch
7+
actions:
8+
merge:
9+
method: merge

project/ProjectPlugin.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ object ProjectPlugin extends AutoPlugin {
1919
val shapeless: String = "2.3.3"
2020
val scalatest: String = "3.1.0"
2121
val scalatestplusScheck: String = "3.1.0.0-RC2"
22-
val scalacheck: String = "1.14.2"
23-
val scalacheckShapeless: String = "1.2.4"
22+
val scalacheck: String = "1.14.3"
23+
val scalacheckShapeless: String = "1.2.3"
2424
}
2525
}
2626

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.7
1+
sbt.version=1.3.8

0 commit comments

Comments
 (0)