From 55fbcfdf19b2835327680066a33c681cbb771004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= Date: Mon, 8 May 2017 18:33:02 +0200 Subject: [PATCH 1/2] Upgrades sbt-org-policies plugin --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 46530ce03..5f4c3a058 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.4.18") +addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.4.24") From b4642c22483e6cbcf7a8e2da62b3ce5f1b24158e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= Date: Mon, 8 May 2017 20:26:46 +0200 Subject: [PATCH 2/2] Fixes js compilation error in scala 2.11 --- project/ProjectPlugin.scala | 2 +- project/plugins.sbt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 9952711dd..6b2dc02cf 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -41,7 +41,7 @@ object ProjectPlugin extends AutoPlugin { %%("circe-generic"), %%("circe-parser"), %%("base64"), - "org.scalamock" %% "scalamock-scalatest-support" % "3.5.0" % Test, + %%("scalamockScalatest") % "test", %%("scalatest") % "test" ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5f4c3a058..008921ebd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1,2 @@ -addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.4.24") +addSbtPlugin( + "com.47deg" % "sbt-org-policies" % "0.4.24" exclude ("io.get-coursier", "sbt-coursier"))