Skip to content

Upgrade finagle to 22.4.0 #286

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.

Sign up for GitHub

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

Open
crispywalrus wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrade finagle to 22.4.0 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af920f7
upgrade to finagle
crispywalrus Apr 26, 2022
150d489
Merge pull request #1 from crispywalrus/upgrade-finage
crispywalrus Apr 26, 2022
b82b2d9
update sbt and scala versions
Apr 26, 2022
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
20 changes: 10 additions & 10 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import ReleaseTransformations._

lazy val buildSettings = Seq(
organization := "io.github.finagle",
scalaVersion := "2.13.2",
crossScalaVersions := Seq("2.12.11", "2.13.2"),
fork in Test := true
scalaVersion := "2.13.8",
crossScalaVersions := Seq("2.12.15", "2.13.8"),
Test / fork := true
)

def circeTestingVersion(scalaV: String) = {
Expand All @@ -14,8 +14,8 @@ def circeTestingVersion(scalaV: String) = {
val baseSettings = Seq(
resolvers += Resolver.bintrayRepo("jeremyrsmith", "maven"),
libraryDependencies ++= Seq(
"com.twitter" %% "finagle-core" % "21.4.0",
"com.twitter" %% "finagle-netty4" % "21.4.0",
"com.twitter" %% "finagle-core" % "22.4.0",
"com.twitter" %% "finagle-netty4" % "22.4.0",
"org.scalatest" %% "scalatest" % "3.2.8" % "test,it",
"org.scalatestplus" %% "scalatestplus-scalacheck" % "3.1.0.0-RC2" % "test,it",
"org.scalacheck" %% "scalacheck" % "1.15.3" % "test,it",
Expand All @@ -34,7 +34,7 @@ lazy val publishSettings = Seq(
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
},
publishArtifact in Test := false,
Test / publishArtifact := false,
pgpSecretRing := file("local.secring.gpg"),
pgpPublicRing := file("local.pubring.gpg"),
releasePublishArtifactsAction := PgpKeys.publishSigned.value,
Expand Down Expand Up @@ -112,21 +112,21 @@ lazy val docs = project
scaladocLatestPath := (if (isSnapshot.value) "api/latest-snapshot"
else "api/latest"),
tutPath := "doc",
includeFilter in makeSite := (includeFilter in makeSite).value || "*.md" || "*.yml",
makeSite / includeFilter := (makeSite / includeFilter).value || "*.md" || "*.yml",
addMappingsToSiteDir(
mappings in (ScalaUnidoc, packageDoc),
ScalaUnidoc / packageDoc / mappings,
scaladocLatestPath
),
addMappingsToSiteDir(
mappings in (ScalaUnidoc, packageDoc),
ScalaUnidoc / packageDoc / mappings,
scaladocVersionPath
),
ghpagesNoJekyll := false,
git.remoteRepo := "git@github.com:finagle/finagle-postgres"
)
.dependsOn(`finagle-postgres`, `finagle-postgres-shapeless`)

parallelExecution in Test := false
Test / parallelExecution := false

scalacOptions ++= Seq(
"-deprecation"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.12
sbt.version=1.6.2