Skip to content

Commit

Permalink
Upgrade dependencies and cross build to 2.13.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas Rinaudo committed Oct 1, 2020
1 parent 12ffd1e commit 1cbd1d5
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 15 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
sudo: false
dist: trusty
language: scala
scala:
- 2.11.8
- 2.12.1
- 2.11.12
- 2.12.12
- 2.13.3
jdk:
- oraclejdk8
- oraclejdk8
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
lazy val buildSettings = Seq(
organization := "com.github.finagle",
version := "0.1.0",
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.11.8", "2.12.1")
version := "0.2.0-SNAPSHOT",
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3")
)

val baseSettings = Seq(
libraryDependencies ++= Seq(
"com.twitter" %% "finagle-http" % "6.41.0",
"org.scalacheck" %% "scalacheck" % "1.13.4" % "test",
"org.scalatest" %% "scalatest" % "3.0.0" % "test"
"com.twitter" %% "finagle-http" % "20.9.0",
"org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
"org.scalatest" %% "scalatest" % "3.2.2" % "test"
)
)

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=1.3.13
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ resolvers ++= Seq(
"jgit-repo" at "http://download.eclipse.org/jgit/maven"
)

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
8 changes: 4 additions & 4 deletions src/test/scala/com/twitter/finagle/http/BasicAuthSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package com.twitter.finagle.http

import com.twitter.finagle.Service
import com.twitter.util.{Await, Base64StringEncoder, Future}
import org.scalatest.FunSuite
import org.scalatest.prop.GeneratorDrivenPropertyChecks
import org.scalatest.funsuite.AnyFunSuite
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks

class BasicAuthSuite extends FunSuite with GeneratorDrivenPropertyChecks {
class BasicAuthSuite extends AnyFunSuite with ScalaCheckPropertyChecks {

val ok = new Service[Request, Response] {
def apply(req: Request): Future[Response] = Future.value(Response())
Expand Down Expand Up @@ -49,4 +49,4 @@ class BasicAuthSuite extends FunSuite with GeneratorDrivenPropertyChecks {
assert(Await.result(all(req)).status == Status.Unauthorized)
}
}
}
}

0 comments on commit 1cbd1d5

Please sign in to comment.