From 62b3222af9976f02811b0b98744a336d08820712 Mon Sep 17 00:00:00 2001
From: Matthew Farwell <matthew@farwell.co.uk>
Date: Sun, 13 Dec 2015 17:39:31 +0100
Subject: [PATCH 1/2] Add scalastyle

---
 common.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common.conf b/common.conf
index 732f76801..cee22d16d 100644
--- a/common.conf
+++ b/common.conf
@@ -110,6 +110,7 @@ vars: {
   slick-ref                    : "slick/slick.git#3.1"   // stay here; master wants Java 8
   scalamock-ref                : "paulbutcher/scalamock.git"
   scalariform-ref              : "daniel-trinh/scalariform.git"
+  scalastyle-ref               : "scalastyle/scalastyle.git"
 
   // master depends on Akka HTTP and Akka Stream, which are tricky to depend on
   // (they are built only a special branch). so freeze right over the dependency was added.
@@ -482,6 +483,12 @@ build += {
     extra.projects: ["scalariform"]
   }
 
+  ${vars.base} {
+    name:   "scalastyle",
+    uri:    "https://github.com/"${vars.scalastyle-ref}
+    extra.sbt-version: ${vars.sbt-version-override}
+  }
+
   ${vars.base} {
     name:   "scalamock",
     uri:    "https://github.com/"${vars.scalamock-ref}

From f5ff141bad5e6b54511137c46c249533bfac8b29 Mon Sep 17 00:00:00 2001
From: Matthew Farwell <matthew@farwell.co.uk>
Date: Sun, 28 Feb 2016 13:49:45 +0100
Subject: [PATCH 2/2] scalastyle: Added option to not publish to maven repo

---
 common.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common.conf b/common.conf
index cee22d16d..852b4f9e1 100644
--- a/common.conf
+++ b/common.conf
@@ -487,6 +487,9 @@ build += {
     name:   "scalastyle",
     uri:    "https://github.com/"${vars.scalastyle-ref}
     extra.sbt-version: ${vars.sbt-version-override}
+    extra: ${vars.base.extra} {
+      options: ["-Dscalastyle.publish-ivy-only=true"]
+    }
   }
 
   ${vars.base} {