From b7cd1c96a3970b9ce656d5518782a12a2d5f7319 Mon Sep 17 00:00:00 2001
From: Andriy Kyrylyuk <kyrylyuk.a@gmail.com>
Date: Fri, 13 Mar 2026 12:58:11 -0400
Subject: [PATCH 1/3] restore CI

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f583db7cf..df9bd10c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,8 @@ jobs:
       with:
         java-version: ${{ matrix.java }}
         distribution: 'zulu'
+    - name: Install sbt
+      uses: sbt/setup-sbt@v1
     - name: Build
       run: |
         docker run -d -p 127.0.0.1:5432:5432 flowcommerce/apibuilder-postgresql:latest-pg15

From abeb299268360fc2dbeff69f99c608d710663fb8 Mon Sep 17 00:00:00 2001
From: Andriy Kyrylyuk <kyrylyuk.a@gmail.com>
Date: Fri, 13 Mar 2026 13:01:55 -0400
Subject: [PATCH 2/3] bump scala version

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df9bd10c6..8b9a93fa4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         java: [ '17' ]
-        scala: [ '3.4.2' ]
+        scala: [ '3.7.3' ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK

From b0402f91b9080fa3a71259fd12c56fbf8f891d70 Mon Sep 17 00:00:00 2001
From: Jack Lynch <jack@flow.io>
Date: Fri, 13 Mar 2026 18:59:31 +0000
Subject: [PATCH 3/3] bump to available yet compatible version with Scala 3.7.4

---
 app/app/lib/MemberDownload.scala               |  6 +++---
 build.sbt                                      | 10 +++++-----
 generated/app/db/GeneratorInvocationsDao.scala |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/app/lib/MemberDownload.scala b/app/app/lib/MemberDownload.scala
index 5ff4ddba1..42e804d77 100644
--- a/app/app/lib/MemberDownload.scala
+++ b/app/app/lib/MemberDownload.scala
@@ -1,7 +1,6 @@
 package lib
 
-import com.github.tototoshi.csv.{CSVFormat, CSVWriter}
-import com.github.tototoshi.csv.defaultCSVFormat
+import com.github.tototoshi.csv.{CSVFormat, CSVWriter, DefaultCSVFormat}
 
 import java.io.File
 import io.apibuilder.api.v0.models.Membership
@@ -17,7 +16,8 @@ case class MemberDownload(
   def csv()(implicit ec: ExecutionContext): Future[File] = Future {
     val file = File.createTempFile(s"member-download-$orgKey", "csv")
 
-    val writer = CSVWriter.open(file)(using defaultCSVFormat)
+    given CSVFormat = new DefaultCSVFormat {}
+    val writer = CSVWriter.open(file)
     writer.writeRow(Seq("guid", "role", "user_guid", "user_email", "user_nickname", "user_name"))
 
     Pager.eachPage[Membership] { offset =>
diff --git a/build.sbt b/build.sbt
index 7e838b9ef..1f51a04fc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -86,8 +86,8 @@ lazy val generated = project
     libraryDependencies ++= Seq(
       ws,
       jdbc,
-      "com.github.mbryzek" % "lib-query" % "0.0.5",
-      "com.github.mbryzek" % "lib-util" % "0.0.16",
+      "com.github.mbryzek" % "lib-query" % "0.0.14",
+      "com.github.mbryzek" % "lib-util" % "0.0.24",
       "joda-time" % "joda-time" % "2.14.0",
       "org.playframework.anorm" %% "anorm-postgres" % "2.7.0",
       "org.postgresql" % "postgresql" % "42.7.7",
@@ -120,10 +120,10 @@ lazy val api = project
       "com.google.inject" % "guice" % "5.1.0",
       "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0",
       "org.projectlombok" % "lombok" % "1.18.42" % "provided",
-      ("com.github.mbryzek" % "lib-cipher" % "0.0.8").cross(CrossVersion.for3Use2_13),
-      "com.github.mbryzek" % "lib-util" % "0.0.16",
+      "com.github.mbryzek" % "lib-cipher" % "0.0.13",
+      "com.github.mbryzek" % "lib-util" % "0.0.24",
       "com.sendgrid"      %  "sendgrid-java"  % "4.10.3",
-      "com.github.mbryzek" % "lib-query" % "0.0.5",
+      "com.github.mbryzek" % "lib-query" % "0.0.14",
       "com.rollbar" % "rollbar-java" % "2.0.0",
       "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test,
       "com.github.tomakehurst" % "wiremock-standalone" % "3.0.1" % Test
diff --git a/generated/app/db/GeneratorInvocationsDao.scala b/generated/app/db/GeneratorInvocationsDao.scala
index 73bff235b..3a6ea34d9 100644
--- a/generated/app/db/GeneratorInvocationsDao.scala
+++ b/generated/app/db/GeneratorInvocationsDao.scala
@@ -196,8 +196,8 @@ class GeneratorInvocationsDao @javax.inject.Inject() (override val db: play.api.
 
   import anorm.postgresql.*
 
-  private val pkeyGenerator: com.mbryzek.util.IdGenerator = {
-    com.mbryzek.util.IdGenerator("gni")
+  private val pkeyGenerator: com.bryzek.util.IdGenerator = {
+    com.bryzek.util.IdGenerator("gni")
   }
 
   def randomPkey: String = {