Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@ jobs:
strategy:
matrix:
java: [ '17' ]
scala: [ '3.4.2' ]
scala: [ '3.7.3' ]
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v2
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
Expand Down
6 changes: 3 additions & 3 deletions app/app/lib/MemberDownload.scala
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 =>
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions generated/app/db/GeneratorInvocationsDao.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Loading