Merge branch 'master' into update/sbt-1.3.8

scala-exercises · Feb 14, 2020 · 5b80ef6 · 5b80ef6
2 parents c2a7e17 + 130b804
commit 5b80ef6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,9 @@
+pull_request_rules:
+  - name: Automatic merge scala-steward PRs when CI is passing
+    conditions:
+      - author=scala-steward
+      - status-success=continuous-integration/travis-ci/pr
+      - body~=labels:.*semver-patch
+    actions:
+      merge:
+        method: merge
diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
@@ -20,7 +20,7 @@ object ProjectPlugin extends AutoPlugin {
       val scalatest: String           = "3.1.0"
       val scalatestplusScheck: String = "3.1.0.0-RC2"
       val scalacheck: String          = "1.14.3"
-      val scalacheckShapeless: String = "1.2.3"
+      val scalacheckShapeless: String = "1.2.4"
     }
   }