Merge pull request #535 from SethTisue/sbt-0.13.16

upgrade to sbt 0.13.16 + refresh MiMA + reinstate conductr-lib + add scalastyle + refresh lightbend-emoji

Author: SethTisue

configs/community.dbuild

@@ -30,7 +30,7 @@ include file(".dbuild/resolvers.conf")
 
 vars {
   default-commands: []
-  sbt-version: "0.13.15"
+  sbt-version: "0.13.16-RC1"
 }
 
 //// compiler options manipulation
@@ -538,15 +538,9 @@ build += {
     extra.options: ["-DSKIP_FLAKY=true"]
   }
 
-  // note that we don't have MiMa in the JDK6 build.  I tried but it
-  // was running out of PermGen when running the functional tests.
-  // rather than sink time into investigating, just confining it to
-  // JDK8 world seems perfectly fine.
   ${vars.base} {
     name: "mima"
     uri:  ${vars.uris.mima-uri}
-    // normally MiMa runs on 2.10 (because sbt 0.13 does), so the branch won't
-    // be merged onto master for quite a while yet
     // we don't compile sbt plugins
     extra.exclude: ["sbtplugin"]
   }
@@ -867,6 +861,22 @@ build += {
     extra.projects: ["coreJVM", "tckTests"]  // no Scala.js, no benchmarks
   }
 
+  ${vars.base} {
+    name: "conductr-lib"
+    uri:  ${vars.uris.conductr-lib-uri}
+    extra.exclude: [
+      // we don't have Lagom yet
+      "lagom13JavaConductRBundleLib", "lagom13ScalaConductRBundleLib"
+      // didn't compile (July 2017)
+      "akka24ConductRClientLib"
+      // not our Akka version
+      "akka25Common", "akka25ConductRBundleLib", "akka25ConductRClientLib", "akka25TestLib"
+      // Play stuff didn't work, maybe try again later?
+      "play25ConductRBundleLib", "play25ConductRClientLib", "play25Common"
+      "play26ConductRBundleLib", "play26ConductRClientLib", "play26Common"
+    ]
+  }
+
   // this was added because conductr-lib's Play integration depended on it,
   // but we ended up not including that integration (for now anyway?), so
   // nothing depends on this.  leaving it in since we might as well, but
@@ -1111,11 +1121,11 @@ build += {
     uri:  ${vars.uris.scalaj-http-uri}
   }
 
-  // forked (April 2017) to get rid of the usual bintray-sbt stuff that
-  // makes dbuild upset
+  // forked (April 2017; updated July 2017) to get rid of the usual bintray-sbt stuff
+  // that makes dbuild upset
   ${vars.base} {
-    name: "typesafe-emoji"
-    uri:  ${vars.uris.typesafe-emoji-uri}
+    name: "lightbend-emoji"
+    uri:  ${vars.uris.lightbend-emoji-uri}
   }
 
   // others are not depending on this yet ("not ready for general
@@ -1194,4 +1204,11 @@ build += {
      extra.test-tasks: ["compile"]
   }
 
+  // forked (July 2017) to get rid of the usual bintray-sbt stuff that
+  // makes dbuild upset
+  ${vars.base} {
+     name: "scalastyle"
+     uri: ${vars.uris.scalastyle-uri}
+  }
+
 ]}

configs/project-refs.conf

@@ -21,7 +21,7 @@ vars.uris: {
   catalysts-uri:                "https://github.com/typelevel/catalysts.git"
   cats-uri:                     "https://github.com/typelevel/cats.git#669a0235"  # was master
   cats-effect-uri:              "https://github.com/typelevel/cats-effect.git#2e0e05c"  # was master
-
+  conductr-lib-uri:             "https://github.com/typesafehub/conductr-lib.git"
   discipline-uri:               "https://github.com/typelevel/discipline.git#v0.7"
   dispatch-uri:                 "https://github.com/dispatch/reboot.git#0.12.x"
   doodle-uri:                   "https://github.com/scalacommunitybuild/doodle.git#community-build-2.12"
@@ -40,11 +40,12 @@ vars.uris: {
   kind-projector-uri:           "https://github.com/non/kind-projector.git"
   kxbmap-configs-uri:           "https://github.com/kxbmap/configs.git"
   lift-json-uri:                "https://github.com/lift/framework.git"
+  lightbend-emoji-uri:          "https://github.com/scalacommunitybuild/lightbend-emoji.git#community-build-2.12"
   log4s-uri:                    "https://github.com/Log4s/log4s.git"
   machinist-uri:                "https://github.com/typelevel/machinist.git"
   macro-compat-uri:             "https://github.com/milessabin/macro-compat.git"
   macro-paradise-uri:           "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12"
-  mima-uri:                     "https://github.com/typesafehub/migration-manager.git#scala-2.12"
+  mima-uri:                     "https://github.com/typesafehub/migration-manager.git"
   minitest-uri:                 "https://github.com/monix/minitest.git"
   monix-uri:                    "https://github.com/monix/monix.git#series/2.x"
   monocle-uri:                  "https://github.com/julien-truffaut/Monocle.git"
@@ -85,6 +86,7 @@ vars.uris: {
   scalapb-uri:                  "https://github.com/scalapb/ScalaPB.git#268318c"  # was master
   scalaprops-uri:               "https://github.com/scalaprops/scalaprops.git"
   scalariform-uri:              "https://github.com/scala-ide/scalariform.git"
+  scalastyle-uri:               "https://github.com/scalacommunitybuild/scalastyle.git#community-build-2.12"
   scalatags-uri:                "https://github.com/lihaoyi/scalatags.git"
   scalatest-uri:                "https://github.com/scalatest/scalatest.git#3.0.x"
   scalatex-uri:                 "https://github.com/lihaoyi/scalatex.git"
@@ -107,7 +109,6 @@ vars.uris: {
   twirl-uri:                    "https://github.com/playframework/twirl.git"
   twitter-util-uri:             "https://github.com/twitter/util.git#develop"
   twotails-uri:                 "https://github.com/wheaties/TwoTails.git"
-  typesafe-emoji-uri:           "https://github.com/scalacommunitybuild/typesafe-emoji.git#community-build-2.12"
   unfiltered-uri:               "https://github.com/unfiltered/unfiltered.git#0.9.0"
   upickle-uri:                  "https://github.com/scalacommunitybuild/upickle-pprint.git#community-build-2.12"
   utest-uri:                    "https://github.com/scalacommunitybuild/utest.git#community-build-2.12"