Permalink
Browse files

Update finagle to 5.3.6.

  • Loading branch information...
1 parent 8657395 commit 5df443c8afa52904a04d9d3ef63179b5f7f74dc7 @jonshea jonshea committed Aug 22, 2012
Showing with 11 additions and 16 deletions.
  1. +11 −13 build.sbt
  2. +0 −3 project/plugins.sbt
View
@@ -1,10 +1,10 @@
name := "slashem"
-version := "0.15.2"
+version := "0.15.3"
organization := "com.foursquare"
-crossScalaVersions := Seq("2.9.1")
+scalaVersion := "2.9.1"
libraryDependencies <++= (scalaVersion) { scalaVersion =>
val specsVersion = scalaVersion match {
@@ -31,10 +31,9 @@ libraryDependencies <++= (scalaVersion) { scalaVersion =>
"org.codehaus.jackson" % "jackson-mapper-asl" % "1.8.8",
"org.codehaus.jackson" % "jackson-core-asl" % "1.8.8",
"org.scala-tools.testing" %% "scalacheck" % scalaCheckVersion % "test",
- "com.twitter" %% "finagle" % "1.9.12" % "compile" exclude("thrift","libthrift") intransitive(),
- "com.twitter" %% "finagle-core" % "1.9.12" % "compile" exclude("thrift","libthrift"),
- "com.twitter" %% "finagle-http" % "1.9.12" % "compile" exclude("thrift","libthrift"),
- "com.twitter" %% "util-core" % "1.12.9" % "compile",
+ "com.twitter" % "finagle-core" % "5.3.6" % "compile" exclude("thrift","libthrift"),
+ "com.twitter" % "finagle-http" % "5.3.6" % "compile" exclude("thrift","libthrift"),
+ "com.twitter" % "util-core" % "1.12.9" % "compile",
"org.scalaj" %% "scalaj-collection" % "1.2"
)
}
@@ -47,13 +46,12 @@ publishTo <<= (version) { v =>
Some("releases" at nexus+"service/local/staging/deploy/maven2")
}
-resolvers += "Bryan J Swift Repository" at "http://repos.bryanjswift.com/maven2/"
-
-resolvers += "twitter maven repo" at "http://maven.twttr.com/"
-
-resolvers += "codehaus maven repo" at "http://repository.codehaus.org/"
-
-resolvers += "sonatype maven repo" at "http://oss.sonatype.org/content/repositories/releases/"
+resolvers ++= Seq(
+ "Bryan J Swift Repository" at "http://repos.bryanjswift.com/maven2/",
+ "twitter maven repo" at "http://maven.twttr.com/",
+ "codehaus maven repo" at "http://repository.codehaus.org/",
+ "sonatype maven repo" at "http://oss.sonatype.org/content/repositories/releases/"
+)
resolvers <++= (version) { v =>
View
@@ -1,3 +0,0 @@
-resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases")) (Resolver.ivyStylePatterns)
-
-addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")

0 comments on commit 5df443c

Please sign in to comment.