From 7e6e7e97641fa4fd028b46c69b7f421803466fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= Date: Mon, 8 May 2017 13:22:13 +0200 Subject: [PATCH] Upgrades libraries and adds cassandra driver --- .../main/scala/sbtorgpolicies/libraries.scala | 166 +++++++++--------- project/ProjectPlugin.scala | 2 +- version.sbt | 2 +- 3 files changed, 87 insertions(+), 83 deletions(-) diff --git a/core/src/main/scala/sbtorgpolicies/libraries.scala b/core/src/main/scala/sbtorgpolicies/libraries.scala index 1d3d8ca..724e4f8 100644 --- a/core/src/main/scala/sbtorgpolicies/libraries.scala +++ b/core/src/main/scala/sbtorgpolicies/libraries.scala @@ -30,65 +30,66 @@ object libraries { ) protected val vOthers: Map[String, String] = Map[String, String]( - "akka" -> "2.5.1", - "akka-http" -> "10.0.6", - "algebra" -> "0.7.0", - "alleycats" -> "0.1.9", - "aws-sdk" -> "1.11.125", - "base64" -> "0.2.3", - "catalysts" -> "0.0.5", - "catbird" -> "0.14.0", - "cats" -> "0.9.0", - "circe" -> "0.7.1", - "config" -> "1.3.1", - "coursier" -> "1.0.0-RC1", - "discipline" -> "0.7.3", - "doobie" -> "0.4.1", - "embedded-redis" -> "0.6", - "export-hook" -> "1.2.0", - "finch" -> "0.14.1", - "fs2" -> "0.9.5", - "fs2-cats" -> "0.3.0", - "h2" -> "1.4.195", - "http4s" -> "0.17.0-M2", - "joda-convert" -> "1.8.1", - "joda-time" -> "2.9.9", - "journal" -> "3.0.18", - "jwt-scala" -> "0.12.1", - "kind-projector" -> "0.9.3", - "log4s" -> "1.3.4", - "machinist" -> "0.6.1", - "macro-compat" -> "1.1.1", - "monix" -> "2.3.0", - "monocle" -> "1.4.0", - "mockito" -> "2.7.22", - "moultingyaml" -> "0.4.0", - "newrelic" -> "3.38.0", - "paradise" -> "2.1.0", - "pcplod" -> "1.2.0", - "play" -> "2.6.0-M5", - "pure-config" -> "0.7.0", - "rediscala" -> "1.8.0", - "refined" -> "0.8.0", - "roshttp" -> "2.0.1", - "scala-reflect" -> "2.11.8", - "scalacheck" -> "1.13.5", - "scheckShapeless" -> "1.1.5", - "scalactic" -> "3.0.3", - "scalaj" -> "2.3.0", - "scalamock" -> "3.5.0", - "scalatags" -> "0.6.5", - "scalatest" -> "3.0.3", - "scalaz" -> "7.2.12", - "scalazspecs2" -> "0.5.0", - "scanamo" -> "0.9.3", - "shapeless" -> "2.3.2", - "shocon" -> "0.1.7", - "simulacrum" -> "0.10.0", - "slf4j" -> "1.7.25", - "slogging" -> "0.5.2", - "specs2" -> "3.8.9", - "slick" -> "3.2.0" + "akka" -> "2.5.1", + "akka-http" -> "10.0.6", + "algebra" -> "0.7.0", + "alleycats" -> "0.1.9", + "aws-sdk" -> "1.11.126", + "base64" -> "0.2.3", + "cassandra-driver" -> "3.2.0", + "catalysts" -> "0.0.5", + "catbird" -> "0.14.0", + "cats" -> "0.9.0", + "circe" -> "0.7.1", + "config" -> "1.3.1", + "coursier" -> "1.0.0-RC2", + "discipline" -> "0.7.3", + "doobie" -> "0.4.1", + "embedded-redis" -> "0.6", + "export-hook" -> "1.2.0", + "finch" -> "0.14.1", + "fs2" -> "0.9.5", + "fs2-cats" -> "0.3.0", + "h2" -> "1.4.195", + "http4s" -> "0.17.0-M2", + "joda-convert" -> "1.8.1", + "joda-time" -> "2.9.9", + "journal" -> "3.0.18", + "jwt-scala" -> "0.12.1", + "kind-projector" -> "0.9.3", + "log4s" -> "1.3.4", + "machinist" -> "0.6.1", + "macro-compat" -> "1.1.1", + "monix" -> "2.3.0", + "monocle" -> "1.4.0", + "mockito" -> "2.7.22", + "moultingyaml" -> "0.4.0", + "newrelic" -> "3.38.0", + "paradise" -> "2.1.0", + "pcplod" -> "1.2.0", + "play" -> "2.6.0-M5", + "pure-config" -> "0.7.0", + "rediscala" -> "1.8.0", + "refined" -> "0.8.0", + "roshttp" -> "2.0.1", + "scala-reflect" -> "2.11.8", + "scalacheck" -> "1.13.5", + "scheckShapeless" -> "1.1.5", + "scalactic" -> "3.0.3", + "scalaj" -> "2.3.0", + "scalamock" -> "3.6.0", + "scalatags" -> "0.6.5", + "scalatest" -> "3.0.3", + "scalaz" -> "7.2.12", + "scalazspecs2" -> "0.5.0", + "scanamo" -> "0.9.3", + "shapeless" -> "2.3.2", + "shocon" -> "0.1.7", + "simulacrum" -> "0.10.0", + "slf4j" -> "1.7.25", + "slogging" -> "0.5.2", + "specs2" -> "3.8.9", + "slick" -> "3.2.0" ) val vPlugins47: Map[String, String] = Map[String, String]( @@ -97,22 +98,22 @@ object libraries { ) val vPluginsOthers: Map[String, String] = Map[String, String]( + "sbt-buildinfo" -> "0.7.0", + "sbt-coursier" -> "1.0.0-RC2", + "sbt-ghpages" -> "0.6.0", "sbt-git" -> "0.9.2", - "sbt-unidoc" -> "0.4.0", - "sbt-release" -> "1.0.4", - "sbt-sonatype" -> "1.1", + "sbt-header" -> "1.8.0", "sbt-pgp" -> "1.0.1", - "sbt-ghpages" -> "0.6.0", - "sbt-site" -> "1.2.0", - "tut-plugin" -> "0.4.8", "sbt-jmh" -> "0.2.25", - "scalastyle-sbt-plugin" -> "0.8.0", - "sbt-scoverage" -> "1.5.0", - "sbt-scalajs" -> "0.6.16", - "sbt-header" -> "1.8.0", - "sbt-buildinfo" -> "0.7.0", + "sbt-release" -> "1.0.5", "sbt-scalafmt" -> "0.6.8", - "sbt-coursier" -> "1.0.0-RC1" + "sbt-scalajs" -> "0.6.16", + "sbt-scoverage" -> "1.5.0", + "sbt-site" -> "1.2.0", + "sbt-sonatype" -> "1.1", + "sbt-unidoc" -> "0.4.0", + "scalastyle-sbt-plugin" -> "0.8.0", + "tut-plugin" -> "0.5.0" ) val v: Map[String, String] = v47 ++ vOthers ++ vPlugins47 ++ vPluginsOthers @@ -124,16 +125,19 @@ object libraries { ) val javaLibs: Map[String, Artifact] = Map( - "aws-sdk" -> (("com.amazonaws", "aws-java-sdk", v("aws-sdk"))), - "config" -> (("com.typesafe", "config", v("config"))), - "embedded-redis" -> (("com.orange.redis-embedded", "embedded-redis", v("embedded-redis"))), - "h2" -> (("com.h2database", "h2", v("h2"))), - "joda-convert" -> (("org.joda", "joda-convert", v("joda-convert"))), - "joda-time" -> (("joda-time", "joda-time", v("joda-time"))), - "mockito-core" -> (("org.mockito", "mockito-core", v("mockito"))), - "newrelic" -> (("com.newrelic.agent.java", "newrelic-agent", v("newrelic"))), - "slf4j-nop" -> (("org.slf4j", "slf4j-nop", v("slf4j"))), - "slf4j-simple" -> (("org.slf4j", "slf4j-simple", v("slf4j"))) + "aws-sdk" -> (("com.amazonaws", "aws-java-sdk", v("aws-sdk"))), + "cassandra-driver-core" -> (("com.datastax.cassandra", "cassandra-driver-core", v("cassandra-driver"))), + "cassandra-driver-extras" -> (("com.datastax.cassandra", "cassandra-driver-extras", v("cassandra-driver"))), + "cassandra-driver-mapping" -> (("com.datastax.cassandra", "cassandra-driver-mapping", v("cassandra-driver"))), + "config" -> (("com.typesafe", "config", v("config"))), + "embedded-redis" -> (("com.orange.redis-embedded", "embedded-redis", v("embedded-redis"))), + "h2" -> (("com.h2database", "h2", v("h2"))), + "joda-convert" -> (("org.joda", "joda-convert", v("joda-convert"))), + "joda-time" -> (("joda-time", "joda-time", v("joda-time"))), + "mockito-core" -> (("org.mockito", "mockito-core", v("mockito"))), + "newrelic" -> (("com.newrelic.agent.java", "newrelic-agent", v("newrelic"))), + "slf4j-nop" -> (("org.slf4j", "slf4j-nop", v("slf4j"))), + "slf4j-simple" -> (("org.slf4j", "slf4j-simple", v("slf4j"))) ) val scalaLibs: Map[String, Artifact] = Map( diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index e095ec3..471fcd5 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -35,7 +35,7 @@ object ProjectPlugin extends AutoPlugin { addSbtPlugin("de.heikoseeberger" % "sbt-header" % "1.8.0"), addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0"), addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.6.8"), - addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC1"), + addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC2"), addSbtPlugin("com.47deg" % "sbt-dependencies" % "0.1.1"), addSbtPlugin("com.47deg" % "sbt-microsites" % "0.5.7") ) ++ diff --git a/version.sbt b/version.sbt index 42e2a21..2128031 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.4.24-SNAPSHOT" \ No newline at end of file +version in ThisBuild := "0.4.24" \ No newline at end of file