Adds scala meta settings. (#371)

... and releases a new plugin version
47degrees · Jun 8, 2017 · bfabcce · bfabcce
1 parent de2b105
commit bfabcce
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 65 deletions.
diff --git a/core/src/main/scala/sbtorgpolicies/libraries.scala b/core/src/main/scala/sbtorgpolicies/libraries.scala
@@ -30,68 +30,70 @@ object libraries {
   )
 
   protected val vOthers: Map[String, String] = Map[String, String](
-    "akka"             -> "2.5.2",
-    "akka-http"        -> "10.0.7",
-    "algebra"          -> "0.7.0",
-    "alleycats"        -> "0.1.9",
-    "aws-sdk"          -> "1.11.140",
-    "base64"           -> "0.2.3",
-    "cassandra-driver" -> "3.2.0",
-    "catalysts"        -> "0.0.5",
-    "catbird"          -> "0.14.0",
-    "cats"             -> "0.9.0",
-    "cats-effect"      -> "0.3",
-    "circe"            -> "0.8.0",
-    "config"           -> "1.3.1",
-    "coursier"         -> "1.0.0-RC3",
-    "discipline"       -> "0.7.3",
-    "doobie"           -> "0.4.1",
-    "embedded-redis"   -> "0.6",
-    "export-hook"      -> "1.2.0",
-    "finch"            -> "0.14.1",
-    "fs2"              -> "0.9.7",
-    "fs2-cats"         -> "0.3.0",
-    "h2"               -> "1.4.195",
-    "http4s"           -> "0.17.0-M3",
-    "joda-convert"     -> "1.8.1",
-    "joda-time"        -> "2.9.9",
-    "journal"          -> "3.0.18",
-    "jwt-scala"        -> "0.12.1",
-    "apache-kafka"     -> "0.10.2.1",
-    "kind-projector"   -> "0.9.4",
-    "log4s"            -> "1.3.5",
-    "machinist"        -> "0.6.2",
-    "macro-compat"     -> "1.1.1",
-    "monix"            -> "2.3.0",
-    "monocle"          -> "1.4.0",
-    "mockito"          -> "2.8.9",
-    "moultingyaml"     -> "0.4.0",
-    "newrelic"         -> "3.39.1",
-    "paradise"         -> "2.1.0",
-    "pcplod"           -> "1.2.1",
-    "play"             -> "2.6.0-RC2",
-    "pure-config"      -> "0.7.0",
-    "rediscala"        -> "1.8.0",
-    "refined"          -> "0.8.2",
-    "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.13",
-    "scalazspecs2"     -> "0.5.0",
-    "scanamo"          -> "0.9.4",
-    "shapeless"        -> "2.3.2",
-    "shocon"           -> "0.1.8",
-    "simulacrum"       -> "0.11.0",
-    "slf4j"            -> "1.7.25",
-    "slogging"         -> "0.5.2",
-    "specs2"           -> "3.9.0",
-    "slick"            -> "3.2.0"
+    "akka"               -> "2.5.2",
+    "akka-http"          -> "10.0.7",
+    "algebra"            -> "0.7.0",
+    "alleycats"          -> "0.1.9",
+    "aws-sdk"            -> "1.11.143",
+    "base64"             -> "0.2.3",
+    "cassandra-driver"   -> "3.2.0",
+    "catalysts"          -> "0.0.5",
+    "catbird"            -> "0.14.0",
+    "cats"               -> "0.9.0",
+    "cats-effect"        -> "0.3",
+    "circe"              -> "0.8.0",
+    "config"             -> "1.3.1",
+    "coursier"           -> "1.0.0-RC3",
+    "discipline"         -> "0.7.3",
+    "doobie"             -> "0.4.1",
+    "embedded-redis"     -> "0.6",
+    "export-hook"        -> "1.2.0",
+    "finch"              -> "0.14.1",
+    "fs2"                -> "0.9.7",
+    "fs2-cats"           -> "0.3.0",
+    "h2"                 -> "1.4.195",
+    "http4s"             -> "0.17.0-M3",
+    "joda-convert"       -> "1.8.1",
+    "joda-time"          -> "2.9.9",
+    "journal"            -> "3.0.18",
+    "jwt-scala"          -> "0.12.1",
+    "apache-kafka"       -> "0.10.2.1",
+    "kind-projector"     -> "0.9.4",
+    "log4s"              -> "1.3.5",
+    "machinist"          -> "0.6.2",
+    "macro-compat"       -> "1.1.1",
+    "monix"              -> "2.3.0",
+    "monocle"            -> "1.4.0",
+    "mockito"            -> "2.8.9",
+    "moultingyaml"       -> "0.4.0",
+    "newrelic"           -> "3.39.1",
+    "paradise"           -> "2.1.0",
+    "pcplod"             -> "1.2.1",
+    "play"               -> "2.6.0-RC2",
+    "pure-config"        -> "0.7.0",
+    "rediscala"          -> "1.8.0",
+    "refined"            -> "0.8.2",
+    "roshttp"            -> "2.0.2",
+    "scala-reflect"      -> "2.11.8",
+    "scalacheck"         -> "1.13.5",
+    "scheckShapeless"    -> "1.1.5",
+    "scalactic"          -> "3.0.3",
+    "scalaj"             -> "2.3.0",
+    "scalameta"          -> "1.8.0",
+    "scalameta-paradise" -> "3.0.0-M8",
+    "scalamock"          -> "3.6.0",
+    "scalatags"          -> "0.6.5",
+    "scalatest"          -> "3.0.3",
+    "scalaz"             -> "7.2.13",
+    "scalazspecs2"       -> "0.5.0",
+    "scanamo"            -> "0.9.4",
+    "shapeless"          -> "2.3.2",
+    "shocon"             -> "0.1.8",
+    "simulacrum"         -> "0.11.0",
+    "slf4j"              -> "1.7.25",
+    "slogging"           -> "0.5.2",
+    "specs2"             -> "3.9.0",
+    "slick"              -> "3.2.0"
   )
 
   val vPlugins47: Map[String, String] = Map[String, String](
@@ -266,6 +268,8 @@ object libraries {
     "scheckToolboxComb"      -> (("com.47deg", "scalacheck-toolbox-combinators", v("scheckToolbox"))),
     "scalactic"              -> (("org.scalactic", "scalactic", v("scalactic"))),
     "scalaj"                 -> (("org.scalaj", "scalaj-http", v("scalaj"))),
+    "scalameta"              -> (("org.scalameta", "scalameta", v("scalameta"))),
+    "scalameta-paradise"     -> (("org.scalameta", "paradise", v("scalameta-paradise"))),
     "scalamockScalatest"     -> (("org.scalamock", "scalamock-scalatest-support", v("scalamock"))),
     "scalamockSpecs2"        -> (("org.scalamock", "scalamock-specs2-support", v("scalamock"))),
     "scalatags"              -> (("com.lihaoyi", "scalatags", v("scalatags"))),

diff --git a/core/src/test/scala/sbtorgpolicies/arbitraries/GitHubArbitraries.scala b/core/src/test/scala/sbtorgpolicies/arbitraries/GitHubArbitraries.scala
@@ -154,7 +154,7 @@ trait GitHubArbitraries {
       prerelease  <- Gen.oneOf(true, false)
       createdAt   <- genDateTimeString
       publishedAt <- genDateTimeString
-      author      <- genSimpleUser
+      author      <- Gen.option(genSimpleUser)
       url         <- genURL
       htmlUrl     <- genURL
       assetsUrl   <- genURL

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.5.0")
+addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.5.5")
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
diff --git a/src/main/scala/sbtorgpolicies/settings/AllSettings.scala b/src/main/scala/sbtorgpolicies/settings/AllSettings.scala
@@ -117,6 +117,7 @@ trait AllSettings
   )
 
   /** Using the supplied Versions map, adds the dependencies for scala macros.*/
+  @deprecated("Scala Macros dependencies have been deprecated in favour of the use of Scalameta ones.", "0.5.6")
   lazy val scalaMacroDependencies: Seq[Setting[_]] = {
     Seq(
       libraryDependencies += scalaOrganization.value % "scala-compiler" % scalaVersion.value % "provided",
@@ -136,6 +137,12 @@ trait AllSettings
     )
   }
 
+  lazy val scalaMetaSettings = Seq(
+    addCompilerPlugin(%%("scalameta-paradise") cross CrossVersion.full),
+    libraryDependencies += %%("scalameta"),
+    scalacOptions += "-Xplugin-require:macroparadise"
+  )
+
   /**
    * Scala JS settings shared by many projects.
    *

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.5.6-SNAPSHOT"
+version in ThisBuild := "0.5.6"