From 4bdbd5d6d54cb839841d944e66115f7e0ccfd093 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <ssullivan@gilt.com>
Date: Fri, 3 Nov 2017 00:57:12 -0400
Subject: [PATCH] Scala 2.12.2 -> 2.12.4

---
 .travis.yml                | 6 +++---
 project/Dependencies.scala | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9d87a35..3747cb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 language: scala
 scala:
    - 2.11.11
-   - 2.12.2
+   - 2.12.4
    - 2.13.0-M2
 env:
 - JDK=oraclejdk8
@@ -20,9 +20,9 @@ before_script:
 matrix:
   # scala 2.12 and 2.13 require java 8
   exclude:
-    - scala: 2.12.2
+    - scala: 2.12.4
       env: JDK=oraclejdk7
-    - scala: 2.12.2
+    - scala: 2.12.4
       env: JDK=openjdk7
     - scala: 2.13.0-M2
       env: JDK=oraclejdk7
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index e94972d..0eccd8e 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,7 +4,7 @@ object Version {
   val logback   = "1.2.3"
   val mockito   = "1.10.19"
   val scala     = "2.11.11"
-  val crossScala = List(scala, "2.12.2", "2.13.0-M2")
+  val crossScala = List(scala, "2.12.4", "2.13.0-M2")
   val scalaTest = "3.0.4"
   val slf4j     = "1.7.25"
 }