Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Finagle and other versions #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: scala

scala:
- 2.10.4
- 2.11.4
- 2.10.5
- 2.11.7

jdk:
- oraclejdk7
Expand Down
3 changes: 3 additions & 0 deletions finagle-irc/src/main/scala/com/twitter/finagle/Irc.scala
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ with Server[IrcHandle, Offer[Message]] {
def newClient(name: Name, label: String): ServiceFactory[Offer[Message], IrcHandle] =
IrcClient.newClient(name, label)

def newService(name: Name, label: String): Service[Offer[Message], IrcHandle] =
IrcClient.newService(name, label)

def serve(addr: SocketAddress, service: ServiceFactory[IrcHandle, Offer[Message]]): ListeningServer =
IrcServer.serve(addr, service)
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ case class Transport(
def localAddress = trans.localAddress
def remoteAddress = trans.remoteAddress
def close(deadline: Time) = trans.close(deadline)
def peerCertificate: Option[java.security.cert.Certificate] = None

private[this] def decode(cmdStr: String): Message = {
// TODO: println
Expand Down
12 changes: 6 additions & 6 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ import sbt._
import Keys._

object FinagleIrc extends Build {
val libVersion = "6.24.0"
val libVersion = "6.29.0"

val baseSettings = Defaults.defaultSettings ++ Seq(
libraryDependencies ++= Seq(
"com.twitter" %% "finagle-core" % libVersion,
"org.scalatest" %% "scalatest" % "2.2.2" % "test",
"org.scalatest" %% "scalatest" % "2.2.5" % "test",
"junit" % "junit" % "4.12" % "test"
)
)

lazy val buildSettings = Seq(
organization := "com.github.finagle",
version := libVersion,
scalaVersion := "2.10.4",
crossScalaVersions := Seq("2.10.4", "2.11.4"),
scalaVersion := "2.10.5",
crossScalaVersions := Seq("2.10.5", "2.11.7"),
scalacOptions ++= Seq("-deprecation", "-feature", "-language:postfixOps")
)

Expand Down Expand Up @@ -64,9 +64,9 @@ object FinagleIrc extends Build {

lazy val finagleIrcServer =
finProject("irc-server").settings(
resolvers += "twttr" at "http://maven.twttr.com/",
resolvers += "twttr" at "https://maven.twttr.com/",
libraryDependencies ++= Seq(
"com.twitter" %% "twitter-server" % "1.9.0")
"com.twitter" %% "twitter-server" % "1.14.0")
).dependsOn(finagleIrc)
}

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.7
sbt.version=0.13.9