From af920f79c3d5287e6efd77c1fce36569bfbcb706 Mon Sep 17 00:00:00 2001
From: chris vale <crispywalrus@gmail.com>
Date: Tue, 26 Apr 2022 09:03:27 -0700
Subject: [PATCH 1/2] upgrade to finagle

push finagle forward a year. doing this because finagle versions aren't binarily compatible
---
 build.sbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index d7f75ab..dc4aad4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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",

From b82b2d94e5f767963e16221201ba1ec2892e94f3 Mon Sep 17 00:00:00 2001
From: crispy <christopher.vale@rallyhealth.com>
Date: Tue, 26 Apr 2022 09:16:11 -0700
Subject: [PATCH 2/2] update sbt and scala versions

to support metals, or at least to stop it from whinging
---
 build.sbt                | 16 ++++++++--------
 project/build.properties |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.sbt b/build.sbt
index dc4aad4..a4c96bf 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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) = {
@@ -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,
@@ -112,13 +112,13 @@ 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,
@@ -126,7 +126,7 @@ lazy val docs = project
   )
   .dependsOn(`finagle-postgres`, `finagle-postgres-shapeless`)
 
-parallelExecution in Test := false
+Test / parallelExecution := false
 
 scalacOptions ++= Seq(
   "-deprecation"
diff --git a/project/build.properties b/project/build.properties
index 0caa33f..4ff6415 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.12
\ No newline at end of file
+sbt.version=1.6.2
\ No newline at end of file