Skip to content

Commit

Permalink
Update catbird and other versions
Browse files Browse the repository at this point in the history
  • Loading branch information
travisbrown authored and vkostyukov committed Jun 14, 2017
1 parent 35b77c1 commit 60629b7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: scala
sudo: false
scala:
- 2.11.8
- 2.12.1
- 2.11.11
- 2.12.2
jdk:
- oraclejdk8
before_cache:
Expand Down
21 changes: 10 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import microsites.ExtraMdFileConfig
import com.typesafe.sbt.SbtGhPages.GhPagesKeys._

lazy val buildSettings = Seq(
organization := "com.github.finagle",
version := "0.15.0",
scalaVersion := "2.12.1",
crossScalaVersions := Seq("2.11.8", "2.12.1")
scalaVersion := "2.12.2",
crossScalaVersions := Seq("2.11.11", "2.12.2")
)

lazy val finagleVersion = "6.45.0"
Expand All @@ -14,14 +13,14 @@ lazy val finagleOAuth2Version = "0.6.45"
lazy val finagleHttpAuthVersion = "0.1.0"
lazy val circeVersion = "0.8.0"
lazy val circeJacksonVersion = "0.8.0"
lazy val catbirdVersion = "0.13.0"
lazy val catbirdVersion = "0.15.0"
lazy val shapelessVersion = "2.3.2"
lazy val catsVersion = "0.9.0"
lazy val sprayVersion = "1.3.3"
lazy val playVersion = "2.6.0-M1"
lazy val jacksonVersion = "2.8.6"
lazy val argonautVersion = "6.2-RC2"
lazy val json4sVersion = "3.5.0"
lazy val playVersion = "2.6.0-RC2"
lazy val jacksonVersion = "2.8.8"
lazy val argonautVersion = "6.2"
lazy val json4sVersion = "3.5.2"

lazy val compilerOptions = Seq(
"-deprecation",
Expand All @@ -40,7 +39,7 @@ lazy val compilerOptions = Seq(

val testDependencies = Seq(
"org.scalacheck" %% "scalacheck" % "1.13.5",
"org.scalatest" %% "scalatest" % "3.0.1",
"org.scalatest" %% "scalatest" % "3.0.3",
"org.typelevel" %% "cats-laws" % catsVersion,
"org.typelevel" %% "discipline" % "0.7.3"
)
Expand Down Expand Up @@ -269,7 +268,7 @@ lazy val oauth2 = project
.settings(allSettings)
.settings(libraryDependencies ++= Seq(
"com.github.finagle" %% "finagle-oauth2" % finagleOAuth2Version,
"commons-codec" % "commons-codec" % "1.9",
"commons-codec" % "commons-codec" % "1.10",
"org.mockito" % "mockito-all" % "1.10.19" % "test"
))
.dependsOn(core)
Expand All @@ -289,7 +288,7 @@ lazy val docs = project
"com.github.finagle" %% "finagle-oauth2" % finagleOAuth2Version,
"com.github.finagle" %% "finagle-http-auth" % finagleHttpAuthVersion,
"com.twitter" %% "twitter-server" % twitterServerVersion,
"joda-time" % "joda-time" % "2.9.6",
"joda-time" % "joda-time" % "2.9.9",
"org.mockito" % "mockito-all" % "1.10.19"
)
)
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=0.13.13
sbt.version=0.13.15
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ resolvers ++= Seq(

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.0")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.4")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.5")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.24")
addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.4.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.25")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.6.0")

0 comments on commit 60629b7

Please sign in to comment.