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

Upgrade Plugin deps and plugins #1035

Merged
merged 5 commits into from
Aug 7, 2018
Merged

Upgrade Plugin deps and plugins #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9056f7d
Upgrades libraries and plugins
juanpedromoreno Aug 6, 2018
33aace6
Releases sbt-org-policies 0.9.3
juanpedromoreno Aug 6, 2018
1f8fa5f
Fixes test
juanpedromoreno Aug 6, 2018
ec2b4ea
Seems sbt-pgp 1.1.2 is not published
juanpedromoreno Aug 6, 2018
d731deb
Fixes <= bug
juanpedromoreno Aug 7, 2018
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
103 changes: 59 additions & 44 deletions core/src/main/scala/sbtorgpolicies/libraries.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,100 +21,105 @@ object libraries {
type Artifact = (String, String, String)

val v47: Map[String, String] = Map[String, String](
"iota" -> "0.3.7",
"iota" -> "0.3.8",
"case-classy" -> "0.4.0",
"fetch" -> "0.7.2",
"freestyle" -> "0.8.1",
"frees-rpc" -> "0.13.5",
"freestyle" -> "0.8.2",
"frees-rpc" -> "0.14.1",
"frees-cassandra" -> "0.1.1",
"github4s" -> "0.18.4",
"github4s" -> "0.18.6",
"org-policies" -> sbtorgpolicies.BuildInfo.version,
"scheckToolbox" -> "0.2.4"
"scheckToolbox" -> "0.2.5"
)

protected val vOthers: Map[String, String] = Map[String, String](
"akka" -> "2.5.13",
"akka-http" -> "10.1.1",
"akka" -> "2.5.14",
"akka-http" -> "10.1.3",
"algebra" -> "1.0.0",
"alleycats" -> "1.1.0",
"apache-kafka" -> "1.1.0",
"alleycats" -> "1.2.0",
"apache-kafka" -> "2.0.0",
"avro" -> "1.8.2",
"avro4s" -> "1.9.0",
"avrohugger" -> "1.0.0-RC12",
"base64" -> "0.2.4",
"cassandra-driver" -> "3.5.0",
"catalysts" -> "0.6",
"catbird" -> "18.5.0",
"cats" -> "1.1.0",
"cats-effect" -> "0.10.1",
"cassandra-driver" -> "3.5.1",
"catalysts" -> "0.7",
"catbird" -> "18.7.0",
"cats" -> "1.2.0",
"cats-effect" -> "1.0.0-RC2",
"cats-mtl" -> "0.3.0",
"cats-scalacheck" -> "0.1.0",
"circe" -> "0.9.3",
"config" -> "1.3.3",
"coursier" -> "1.0.3",
"discipline" -> "0.9",
"droste" -> "0.3.1",
"doobie" -> "0.5.3",
"embedded-kafka" -> "1.1.0",
"embedded-kafka" -> "1.1.1",
"embedded-redis" -> "0.6",
"export-hook" -> "1.2.0",
"finch" -> "0.20.0",
"finch" -> "0.22.0",
"fs2" -> "0.10.5",
"fs2-reactive-streams" -> "0.6.0",
"grpc" -> "1.9.0",
"grpc" -> "1.14.0",
"guava" -> "22.0",
"hammock" -> "0.8.4",
"hammock" -> "0.8.5",
"h2" -> "1.4.197",
"http4s" -> "0.18.12",
"joda-convert" -> "2.0.2",
"http4s" -> "0.18.15",
"joda-convert" -> "2.1.1",
"joda-time" -> "2.10",
"journal" -> "3.0.19",
"jwt-scala" -> "0.16.0",
"jwt-scala" -> "0.17.0",
"kind-projector" -> "0.9.7",
"log4s" -> "1.6.1",
"logback" -> "1.2.3",
"machinist" -> "0.6.4",
"machinist" -> "0.6.5",
"macro-compat" -> "1.1.1",
"mainecoon" -> "0.6.2",
"mainecoon" -> "0.6.4",
"monix" -> "3.0.0-M3",
"monocle" -> "1.5.0",
"mockito" -> "2.18.3",
"mockito" -> "2.21.0",
"moultingyaml" -> "0.4.0",
"newrelic" -> "4.1.0",
"paradise" -> "2.1.0",
"netty-tcnative" -> "2.0.12.Final",
"newrelic" -> "4.3.0",
"paradise" -> "2.1.1",
"pbdirect" -> "0.1.0",
"pcplod" -> "1.2.1",
"play" -> "2.6.15",
"postgresql" -> "42.2.2",
"prometheus" -> "0.4.0",
"play" -> "2.6.17",
"postgresql" -> "42.2.4",
"prometheus" -> "0.5.0",
"pureconfig" -> "0.9.1",
"rediscala" -> "1.8.0",
"refined" -> "0.9.0",
"refined" -> "0.9.2",
"roshttp" -> "2.1.0",
"scala-parser-combinators" -> "1.0.6",
"scala-reflect" -> "2.11.11",
"scalacheck" -> "1.14.0",
"scheckShapeless" -> "1.1.8",
"scalactic" -> "3.0.5",
"scalaj" -> "2.4.0",
"scalaj" -> "2.4.1",
"scalameta" -> "1.8.0", // we keep scalameta at 1.8.0 until we eventually get rid of it
"scalameta-paradise" -> "3.0.0-M11",
"scalamock" -> "3.6.0",
"scalatags" -> "0.6.7",
"scalatest" -> "3.0.5",
"scalaz" -> "7.2.24",
"scalaz" -> "7.2.25",
"scalazspecs2" -> "0.5.2",
"scanamo" -> "0.9.5",
"shapeless" -> "2.3.3",
"shocon" -> "0.2.0",
"simulacrum" -> "0.12.0",
"simulacrum" -> "0.13.0",
"slf4j" -> "1.7.25",
"slick" -> "3.2.3",
"slogging" -> "0.6.1",
"sourcecode" -> "0.1.4",
"specs2" -> "4.2.0",
"twitter-server" -> "18.5.0"
"specs2" -> "4.3.2",
"twitter-server" -> "18.7.0"
)

val vPlugins47: Map[String, String] = Map[String, String](
"sbt-dependencies" -> "0.3.8",
"sbt-microsites" -> "0.7.15"
"sbt-dependencies" -> "0.3.9",
"sbt-microsites" -> "0.7.22"
)

val vPluginsOthers: Map[String, String] = Map[String, String](
Expand All @@ -123,17 +128,17 @@ object libraries {
"sbt-git" -> "1.0.0",
"sbt-header" -> "5.0.0",
"sbt-pgp" -> "1.1.1",
"sbt-jmh" -> "0.3.4",
"sbt-release" -> "1.0.8",
"sbt-jmh" -> "0.3.3",
"sbt-release" -> "1.0.9",
"sbt-scalafmt" -> "0.6.8",
"sbt-scalajs" -> "0.6.23",
"sbt-scoverage" -> "1.5.1",
"sbt-scalajs" -> "0.6.24",
"sbt-scoverage" -> "1.6.0-M3",
"sbt-site" -> "1.3.2",
"sbt-sonatype" -> "2.0",
"sbt-unidoc" -> "0.4.1",
"sbt-sonatype" -> "2.3",
"sbt-unidoc" -> "0.4.2",
"sbt-wartremover" -> "2.2.1",
"scalastyle-sbt-plugin" -> "1.0.0",
"tut-plugin" -> "0.6.4"
"tut-plugin" -> "0.6.7"
)

val v: Map[String, String] = v47 ++ vOthers ++ vPlugins47 ++ vPluginsOthers
Expand All @@ -150,6 +155,7 @@ object libraries {
)

val javaLibs: Map[String, Artifact] = Map(
"avro" -> (("org.apache.avro", "avro", v("avro"))),
"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"))),
Expand Down Expand Up @@ -180,6 +186,9 @@ object libraries {
"algebra" -> (("org.typelevel", "algebra", v("algebra"))),
"alleycats" -> (("org.typelevel", "alleycats-core", v("alleycats"))),
"avro4s" -> (("com.sksamuel.avro4s", "avro4s-core", v("avro4s"))),
"avrohugger-core" -> (("com.julianpeeters", "avrohugger-core", v("avrohugger"))),
"avrohugger-filesorter" -> (("com.julianpeeters", "avrohugger-filesorter", v("avrohugger"))),
"avrohugger-tools" -> (("com.julianpeeters", "avrohugger-tools", v("avrohugger"))),
"base64" -> (("com.github.marklister", "base64", v("base64"))),
"classy-cats" -> (("com.47deg", "classy-cats", v("case-classy"))),
"classy-config-typesafe" -> (("com.47deg", "classy-config-typesafe", v("case-classy"))),
Expand All @@ -203,6 +212,7 @@ object libraries {
"cats-laws" -> (("org.typelevel", "cats-laws", v("cats"))),
"cats-macros" -> (("org.typelevel", "cats-macros", v("cats"))),
"cats-mtl-core" -> (("org.typelevel", "cats-mtl-core", v("cats-mtl"))),
"cats-scalacheck" -> (("io.chrisdavenport", "cats-scalacheck", v("cats-scalacheck"))),
"cats-testkit" -> (("org.typelevel", "cats-testkit", v("cats"))),
"circe-core" -> (("io.circe", "circe-core", v("circe"))),
"circe-generic" -> (("io.circe", "circe-generic", v("circe"))),
Expand All @@ -217,6 +227,9 @@ object libraries {
"doobie-postgres" -> (("org.tpolecat", "doobie-postgres", v("doobie"))),
"doobie-scalatest" -> (("org.tpolecat", "doobie-scalatest", v("doobie"))),
"doobie-specs2" -> (("org.tpolecat", "doobie-specs2", v("doobie"))),
"droste-athema" -> (("io.higherkindness", "droste-athema", v("droste"))),
"droste-core" -> (("io.higherkindness", "droste-core", v("droste"))),
"droste-laws" -> (("io.higherkindness", "droste-laws", v("droste"))),
"scalatest-embedded-kafka" -> (("net.manub", "scalatest-embedded-kafka", v("embedded-kafka"))),
"scalatest-embedded-kafka-streams" -> (("net.manub", "scalatest-embedded-kafka-streams", v("embedded-kafka"))),
"export-hook" -> (("org.typelevel", "export-hook", v("export-hook"))),
Expand Down Expand Up @@ -247,6 +260,7 @@ object libraries {
"frees-rpc-common" -> (("io.frees", "frees-rpc-common", v("frees-rpc"))),
"frees-slick" -> (("io.frees", "frees-slick", v("freestyle"))),
"frees-tagless" -> (("io.frees", "frees-tagless", v("freestyle"))),
"frees-todolist-lib" -> (("io.frees", "frees-todolist-lib", v("freestyle"))),
"frees-twitter-util" -> (("io.frees", "frees-twitter-util", v("freestyle"))),
"fs2-core" -> (("co.fs2", "fs2-core", v("fs2"))),
"fs2-io" -> (("co.fs2", "fs2-io", v("fs2"))),
Expand Down Expand Up @@ -294,6 +308,7 @@ object libraries {
"monocle-macro" -> (("com.github.julien-truffaut", "monocle-macro", v("monocle"))),
"monocle-state" -> (("com.github.julien-truffaut", "monocle-state", v("monocle"))),
"moultingyaml" -> (("net.jcazevedo", "moultingyaml", v("moultingyaml"))),
"netty-tcnative-boringssl-static" -> (("io.netty", "netty-tcnative-boringssl-static", v("netty-tcnative"))),
"org-policies-core" -> (("com.47deg", "org-policies-core", v("org-policies"))),
"pbdirect" -> (("beyondthelines", "pbdirect", v("pbdirect"))),
"pcplod" -> (("org.ensime", "pcplod", v("pcplod"))),
Expand Down
7 changes: 3 additions & 4 deletions core/src/main/scala/sbtorgpolicies/templates/badges.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,9 @@ object badges {

val badgeVersion = sjsV match {
case sjsVSplit(major, minor, patch, other) if ((major == "0") && (minor == "6")) =>
patch match {
case "17" | "18" | "19" | "20" => s"$major.$minor.17"
case "21" => "1.0.0-M1"
case _ => sjsV
patch.toInt match {
case d if d >= 17 && d <= 24 => s"$major.$minor.17"
case _ => sjsV
}
case _ => sjsV
}
Expand Down
4 changes: 1 addition & 3 deletions core/src/test/scala/sbtorgpolicies/templates/badgesTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ class badgesTest extends TestOps with badgeArbitraries {
case Some(version) =>
result.map(_.contains {
version match {
case "0.6.17" | "0.6.18" | "0.6.19" | "0.6.20" =>
case "0.6.17" | "0.6.18" | "0.6.19" | "0.6.20" | "0.6.21" | "0.6.22" | "0.6.23" | "0.6.24" =>
"0.6.17"
case "0.6.21" =>
"1.0.0-M1"
case _ =>
version
}
Expand Down
12 changes: 6 additions & 6 deletions project/ProjectPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@ object ProjectPlugin extends AutoPlugin {
sbtPlugin := true,
crossSbtVersions := Seq(sbtV.`0.13`, sbtV.`1.0`),
resolvers ++= Seq(sonatypeRepo("snapshots"), sonatypeRepo("releases")),
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3"),
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1"),
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7"),
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0"),
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2"),
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.9"),
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3"),
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1"),
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2"),
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2"),
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3"),
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0"),
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0-M3"),
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22"),
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24"),
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.1"),
addSbtPlugin("com.47deg" %% "sbt-dependencies" % "0.3.9"),
addSbtPlugin("com.47deg" %% "sbt-microsites" % "0.7.16"),
addSbtPlugin("com.47deg" %% "sbt-microsites" % "0.7.22"),
libraryDependencies ++= {
val sbtBinaryVersionValue = (sbtBinaryVersion in pluginCrossBuild).value

val scalaBinaryVersionValue = (scalaBinaryVersion in update).value

val (tutPluginVersion, sbtScalafmtVersion) = sbtBinaryVersionValue match {
case "0.13" => ("0.5.6", "0.6.8")
case "1.0" => ("0.6.3", "1.2.0")
case "1.0" => ("0.6.7", "1.2.0")
}

Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import sbt.Resolver.sonatypeRepo
resolvers ++= Seq(sonatypeRepo("snapshots"), sonatypeRepo("releases"))
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.9.2")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.9")
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.9.2"
version in ThisBuild := "0.9.3"