Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added Scala 2.10 support

Removed two deprecation warnings
  • Loading branch information...
commit d83485df5148c33b359f2ac3da425c159fece381 1 parent 1483f20
@d6y d6y authored
View
15 build.sbt
@@ -2,11 +2,11 @@ name := "paypal"
liftVersion <<= liftVersion ?? "2.5-SNAPSHOT"
-version <<= liftVersion apply { _ + "-1.1-SNAPSHOT" }
+version <<= liftVersion apply { _ + "-1.2-SNAPSHOT" }
organization := "net.liftmodules"
-scalaVersion := "2.9.2"
+scalaVersion := "2.10.0"
crossScalaVersions := Seq("2.9.2", "2.9.1-1", "2.9.1")
@@ -24,16 +24,13 @@ libraryDependencies <++= liftVersion { v =>
libraryDependencies <++= scalaVersion { sv =>
"commons-httpclient" % "commons-httpclient" % "3.1" ::
(sv match {
- case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test"
- case _ => "org.scala-tools.testing" %% "specs" % "1.6.8" % "test"
- }) ::
- (sv match {
- case "2.9.2" => "org.scalacheck" % "scalacheck_2.9.1" % "1.9" % "test"
- case _ => "org.scalacheck" %% "scalacheck" % "1.9" % "test"
- }) ::
+ case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
+ case "2.10.0" => "org.specs2" %% "specs2" % "1.13" % "test"
+ }) ::
Nil
}
+
publishTo <<= version { _.endsWith("SNAPSHOT") match {
case true => Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
case false => Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
View
1  project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.1
View
6 src/main/scala/net/liftmodules/paypal/Paypal.scala
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2011 WorldWide Conferencing, LLC
+ * Copyright 2007-2013 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -287,7 +287,7 @@ private object StreamResponseProcessor {
doRead
ret.toList
} catch {
- case _ => Nil
+ case _ : Throwable => Nil
}
}
}
@@ -474,7 +474,7 @@ trait PaypalPDT extends BasePaypalTrait {
def processPDT(r: Req)(): Box[LiftResponse] = {
for (tx <- r.param("tx");
- val resp = PaypalDataTransfer(paypalAuthToken, tx, mode, connection);
+ resp = PaypalDataTransfer(paypalAuthToken, tx, mode, connection);
info <- resp.paypalInfo;
redir <- tryo(pdtResponse(info, r))) yield {
redir
View
2  src/main/scala/net/liftmodules/paypal/Rules.scala
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2010 WorldWide Conferencing, LLC
+ * Copyright 2007-2013 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  src/main/scala/net/liftmodules/paypal/snippet/BuyNow.scala
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2010 WorldWide Conferencing, LLC
+ * Copyright 2007-2013 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  src/test/scala/net/liftmodules/paypal/PaypalIPNSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2010 WorldWide Conferencing, LLC
+ * Copyright 2007-2013 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Please sign in to comment.
Something went wrong with that request. Please try again.