Skip to content

Commit 6c92ddc

Browse files
authored
Merge branch 'master' into update/sbt-1.3.8
2 parents 7e37852 + 8d15883 commit 6c92ddc

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
@@ -21,7 +21,7 @@ object ProjectPlugin extends AutoPlugin {
2121
val scalatest: String = "3.1.0"
2222
val scalatestplusScheck: String = "3.1.0.0-RC2"
2323
val scalacheck: String = "1.14.3"
24-
val scalacheckShapeless: String = "1.2.3"
24+
val scalacheckShapeless: String = "1.2.4"
2525
}
2626
}
2727

0 commit comments

Comments
 (0)