Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Merge branch 'master' into update/HikariCP-5.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jczuchnowski authored Mar 30, 2024
2 parents f063b2a + dc52424 commit 6c7332f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v10
uses: olafurpg/setup-scala@v14
- name: Cache scala dependencies
uses: coursier/cache-action@v5
- name: Lint code
Expand All @@ -34,15 +34,15 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['adopt@1.8', 'adopt@1.11']
java: ['openjdk@1.11.0', 'openjdk@1.17.0']
scala: ['2.12.18', '2.13.10']
steps:
- name: Checkout current branch
uses: actions/[email protected]
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v10
uses: olafurpg/setup-scala@v14
with:
java-version: ${{ matrix.java }}
- name: Cache scala dependencies
Expand All @@ -57,7 +57,7 @@ jobs:
- name: Checkout current branch
uses: actions/[email protected]
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v13
uses: olafurpg/setup-scala@v14
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Check Document Generation
Expand All @@ -73,7 +73,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v10
uses: olafurpg/setup-scala@v14
- name: Cache scala dependencies
uses: coursier/cache-action@v5
- name: Release artifacts
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.11"
version = "3.7.17"
maxColumn = 120
align.preset = most
continuationIndent.defnSite = 2
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ val zioVersion = "2.0.15"
val zioSchemaVersion = "0.4.13"
val testcontainersVersion = "1.18.3"
val testcontainersScalaVersion = "0.41.3"
val logbackVersion = "1.3.8"
val logbackVersion = "1.4.8"

lazy val root = project
.in(file("."))
Expand Down

0 comments on commit 6c7332f

Please sign in to comment.