Skip to content

Commit

Permalink
dep updates doobie 1.0-RC3
Browse files Browse the repository at this point in the history
  • Loading branch information
jatcwang committed Jun 20, 2023
1 parent 0924746 commit 942476d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 19 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.8, 2.12.13]
scala: [2.13.11, 2.12.18]
java: [adopt@1.11]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -50,7 +50,7 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Setup ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7

Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.13]
scala: [2.12.18]
java: [adopt@1.11]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -108,28 +108,28 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.8)
- name: Download target directories (2.13.11)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }}

- name: Inflate target directories (2.13.8)
- name: Inflate target directories (2.13.11)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.13)
- name: Download target directories (2.12.18)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }}
name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}

- name: Inflate target directories (2.12.13)
- name: Inflate target directories (2.12.18)
run: |
tar xf targets.tar
rm targets.tar
- name: Setup ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7

Expand Down
15 changes: 7 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
val zioVersion = "1.0.15"
val circeVersion = "0.14.2"
val doobieVersion = "1.0.0-RC2"
val scala213 = "2.13.8"
val scala212 = "2.12.13"
val circeVersion = "0.14.5"
val doobieVersion = "1.0.0-RC3"
val scala213 = "2.13.11"
val scala212 = "2.12.18"

inThisBuild(
List(
Expand Down Expand Up @@ -41,8 +41,7 @@ lazy val coretest = Project("coretest", file("modules/coretest"))
.settings(noPublishSettings)
.settings(
libraryDependencies ++= Seq(
"com.lihaoyi" %% "pprint" % "0.6.6",
"org.flywaydb" % "flyway-core" % "8.5.12",
"org.flywaydb" % "flyway-core" % "9.19.4",
"io.circe" %% "circe-core" % circeVersion,
"io.circe" %% "circe-parser" % circeVersion,
"io.circe" %% "circe-generic" % circeVersion,
Expand All @@ -54,7 +53,7 @@ lazy val coretest = Project("coretest", file("modules/coretest"))
"org.tpolecat" %% "doobie-postgres" % doobieVersion,
"org.tpolecat" %% "doobie-postgres-circe" % doobieVersion,
"org.tpolecat" %% "doobie-hikari" % doobieVersion,
"org.postgresql" % "postgresql" % "42.3.6",
"org.postgresql" % "postgresql" % "42.6.0",
"com.softwaremill.quicklens" %% "quicklens" % "1.8.8",
"com.whisk" %% "docker-testkit-impl-docker-java" % "0.9.9" % "test",
),
Expand Down Expand Up @@ -158,7 +157,7 @@ ThisBuild / githubWorkflowPublish := Seq(

val setupJekyllSteps = Seq(
WorkflowStep.Use(
UseRef.Public("actions", "setup-ruby", "v1"),
UseRef.Public("ruby", "setup-ruby", "v1"),
name = Some("Setup ruby"),
params = Map("ruby-version" -> "2.7"),
),
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=1.5.5
sbt.version=1.9.0

0 comments on commit 942476d

Please sign in to comment.