Skip to content
This repository has been archived by the owner on Apr 22, 2020. It is now read-only.

Updates plugin build and its libraries catalog #958

Merged
merged 1 commit into from
Jan 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions core/src/main/scala/sbtorgpolicies/libraries.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@ object libraries {
val v47: Map[String, String] = Map[String, String](
"iota" -> "0.3.4",
"case-classy" -> "0.4.0",
"fetch" -> "0.7.1",
"freestyle" -> "0.5.1",
"frees-rpc" -> "0.6.1",
"fetch" -> "0.7.2",
"freestyle" -> "0.6.3",
"frees-rpc" -> "0.10.0",
"frees-cassandra" -> "0.1.1",
"github4s" -> "0.17.0",
"github4s" -> "0.18.0",
"org-policies" -> sbtorgpolicies.BuildInfo.version,
"scheckToolbox" -> "0.2.3"
)

protected val vOthers: Map[String, String] = Map[String, String](
"akka" -> "2.5.8",
"akka" -> "2.5.9",
"akka-http" -> "10.0.11",
"algebra" -> "0.7.0",
"alleycats" -> "1.0.1",
"apache-kafka" -> "1.0.0",
"avro4s" -> "1.8.0",
"base64" -> "0.2.4",
"cassandra-driver" -> "3.3.2",
"cassandra-driver" -> "3.4.0",
"catalysts" -> "0.0.5",
"catbird" -> "17.12.0",
"catbird" -> "18.1.0",
"cats" -> "1.0.1",
"cats-effect" -> "0.8",
"cats-mtl" -> "0.2.2",
Expand All @@ -54,12 +54,13 @@ object libraries {
"embedded-kafka" -> "1.0.0",
"embedded-redis" -> "0.6",
"export-hook" -> "1.2.0",
"finch" -> "0.16.0",
"fs2" -> "0.10.0-M11",
"finch" -> "0.16.1",
"fs2" -> "0.10.0-RC2",
"fs2-cats" -> "0.5.0",
"grpc" -> "1.6.1",
"fs2-reactive-streams" -> "0.2.8",
"grpc" -> "1.9.0",
"guava" -> "22.0",
"hammock" -> "0.8.1",
"hammock" -> "0.8.2",
"h2" -> "1.4.196",
"http4s" -> "0.18.0-M8",
"joda-convert" -> "1.9.2",
Expand All @@ -69,19 +70,19 @@ object libraries {
"kind-projector" -> "0.9.5",
"log4s" -> "1.4.0",
"logback" -> "1.2.3",
"machinist" -> "0.6.2",
"machinist" -> "0.6.3",
"macro-compat" -> "1.1.1",
"mainecoon" -> "0.6.1",
"mainecoon" -> "0.6.2",
"monix" -> "3.0.0-M3",
"monocle" -> "1.5.0",
"mockito" -> "2.13.0",
"moultingyaml" -> "0.4.0",
"newrelic" -> "3.46.0",
"paradise" -> "2.1.0",
"pbdirect" -> "0.0.8",
"pbdirect" -> "0.1.0",
"pcplod" -> "1.2.1",
"play" -> "2.6.10",
"postgresql" -> "42.1.4",
"play" -> "2.6.11",
"postgresql" -> "42.2.0",
"pure-config" -> "0.7.0",
"rediscala" -> "1.8.0",
"refined" -> "0.8.6",
Expand All @@ -92,7 +93,7 @@ object libraries {
"scheckShapeless" -> "1.1.8",
"scalactic" -> "3.0.4",
"scalaj" -> "2.3.0",
"scalameta" -> "2.1.5",
"scalameta" -> "2.1.7",
"scalameta-paradise" -> "3.0.0-M10",
"scalamock" -> "3.6.0",
"scalatags" -> "0.6.7",
Expand All @@ -108,7 +109,7 @@ object libraries {
"slogging" -> "0.6.0",
"sourcecode" -> "0.1.4",
"specs2" -> "4.0.2",
"twitter-server" -> "17.12.0"
"twitter-server" -> "18.1.0"
)

val vPlugins47: Map[String, String] = Map[String, String](
Expand All @@ -122,10 +123,10 @@ object libraries {
"sbt-git" -> "0.9.3",
"sbt-header" -> "4.1.0",
"sbt-pgp" -> "1.1.0",
"sbt-jmh" -> "0.3.2",
"sbt-jmh" -> "0.3.3",
"sbt-release" -> "1.0.7",
"sbt-scalafmt" -> "0.6.8",
"sbt-scalajs" -> "0.6.21",
"sbt-scalajs" -> "0.6.22",
"sbt-scoverage" -> "1.5.1",
"sbt-site" -> "1.3.1",
"sbt-sonatype" -> "2.0",
Expand Down Expand Up @@ -249,6 +250,7 @@ object libraries {
"fs2-core" -> (("co.fs2", "fs2-core", v("fs2"))),
"fs2-io" -> (("co.fs2", "fs2-io", v("fs2"))),
"fs2-cats" -> (("co.fs2", "fs2-cats", v("fs2-cats"))),
"fs2-reactive-streams" -> (("com.github.zainab-ali", "fs2-reactive-streams", v("fs2-reactive-streams"))),
"github4s" -> (("com.47deg", "github4s", v("github4s"))),
"grpc-all" -> (("io.grpc", "grpc-all", v("grpc"))),
"grpc-auth" -> (("io.grpc", "grpc-auth", v("grpc"))),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.0.3
sbt.version = 1.0.4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we start using 1.1.0?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if the rest of the plugins we are using are already compatible with 1.1.x.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created an issue some time ago to address it: #910

2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import sbt.Resolver.sonatypeRepo
resolvers ++= Seq(sonatypeRepo("snapshots"), sonatypeRepo("releases"))
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.8.17")
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.8.22")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.8.23-SNAPSHOT"
version in ThisBuild := "0.8.23"