Skip to content

Commit 5b80ef6

Browse files
authored
Merge branch 'master' into update/sbt-1.3.8
2 parents c2a7e17 + 130b804 commit 5b80ef6

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object ProjectPlugin extends AutoPlugin {
2020
val scalatest: String = "3.1.0"
2121
val scalatestplusScheck: String = "3.1.0.0-RC2"
2222
val scalacheck: String = "1.14.3"
23-
val scalacheckShapeless: String = "1.2.3"
23+
val scalacheckShapeless: String = "1.2.4"
2424
}
2525
}
2626

0 commit comments

Comments
 (0)