Skip to content

Commit b97c83d

Browse files
authored
Merge branch 'master' into update/mysql-connector-j-9.1.0
2 parents 210c85e + 4f078df commit b97c83d

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
timeout-minutes: 15
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/[email protected].0
22+
- uses: actions/[email protected].2
2323
- name: Cache sbt
2424
uses: actions/cache@v4
2525
with:
@@ -29,7 +29,7 @@ jobs:
2929
key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
3030

3131
- name: Setup Java
32-
uses: actions/setup-java@v4.3.0
32+
uses: actions/setup-java@v4.5.0
3333
with:
3434
distribution: temurin
3535
java-version: '17'
@@ -77,7 +77,7 @@ jobs:
7777
name: Build ${{matrix.scala_short_dot}} - ${{matrix.module}}
7878

7979
steps:
80-
- uses: actions/[email protected].0
80+
- uses: actions/[email protected].2
8181
- name: Cache sbt
8282
uses: actions/cache@v4
8383
with:
@@ -87,7 +87,7 @@ jobs:
8787
key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
8888

8989
- name: Setup Java
90-
uses: actions/setup-java@v4.3.0
90+
uses: actions/setup-java@v4.5.0
9191
with:
9292
distribution: temurin
9393
java-version: '17'
@@ -108,9 +108,9 @@ jobs:
108108
CI_RELEASE: publishSigned # By default, sbt-ci-release uses the `+publishSigned` which is publishing for all the Scala versions configured, which is not what we want
109109
CI_SNAPSHOT_RELEASE: publish # By default, sbt-ci-release uses the `+publish` which is publishing for all the Scala versions configured, which is not what we want
110110
steps:
111-
- uses: actions/[email protected].0
111+
- uses: actions/[email protected].2
112112
- name: Setup Java
113-
uses: actions/setup-java@v4.3.0
113+
uses: actions/setup-java@v4.5.0
114114
with:
115115
distribution: temurin
116116
java-version: '11'

.github/workflows/scala-steward.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Scala Steward
1414
steps:
1515
- name: Scala Steward
16-
uses: scala-steward-org/scala-steward-action@v2.69.0
16+
uses: scala-steward-org/scala-steward-action@v2.71.0
1717
with:
1818
github-app-id: ${{ secrets.SCALA_STEWARD_GITHUB_APP_ID }}
1919
github-app-installation-id: ${{ secrets.SCALA_STEWARD_GITHUB_APP_INSTALLATION_ID }}

.github/workflows/site.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
if: ${{ github.event_name == 'pull_request' }}
1919
steps:
2020
- name: Git Checkout
21-
uses: actions/[email protected].0
21+
uses: actions/[email protected].2
2222
with:
2323
fetch-depth: '0'
2424
- name: Setup Scala
25-
uses: actions/setup-java@v4.3.0
25+
uses: actions/setup-java@v4.5.0
2626
with:
2727
distribution: temurin
2828
java-version: 17
@@ -39,11 +39,11 @@ jobs:
3939
if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }}
4040
steps:
4141
- name: Git Checkout
42-
uses: actions/[email protected].0
42+
uses: actions/[email protected].2
4343
with:
4444
fetch-depth: '0'
4545
- name: Setup Scala
46-
uses: actions/setup-java@v4.3.0
46+
uses: actions/setup-java@v4.5.0
4747
with:
4848
distribution: temurin
4949
java-version: 17
@@ -63,12 +63,12 @@ jobs:
6363
if: ${{ (github.event_name == 'push') || ((github.event_name == 'release') && (github.event.action == 'published')) }}
6464
steps:
6565
- name: Git Checkout
66-
uses: actions/[email protected].0
66+
uses: actions/[email protected].2
6767
with:
6868
ref: ${{ github.head_ref }}
6969
fetch-depth: '0'
7070
- name: Setup Scala
71-
uses: actions/setup-java@v4.3.0
71+
uses: actions/setup-java@v4.5.0
7272
with:
7373
distribution: temurin
7474
java-version: 17

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ lazy val `quill-core` =
216216
.settings(
217217
libraryDependencies ++= Seq(
218218
"com.typesafe" % "config" % "1.4.3",
219-
"dev.zio" %% "zio-logging" % "2.3.1",
219+
"dev.zio" %% "zio-logging" % "2.3.2",
220220
"dev.zio" %% "zio" % Version.zio,
221221
"dev.zio" %% "zio-streams" % Version.zio,
222222
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
@@ -510,7 +510,7 @@ lazy val `quill-orientdb` =
510510
.settings(
511511
Test / fork := true,
512512
libraryDependencies ++= Seq(
513-
"com.orientechnologies" % "orientdb-graphdb" % "3.2.34"
513+
"com.orientechnologies" % "orientdb-graphdb" % "3.2.35"
514514
)
515515
)
516516
.dependsOn(
@@ -531,11 +531,11 @@ lazy val `quill-test-kit` =
531531

532532
lazy val jdbcTestingLibraries = Seq(
533533
libraryDependencies ++= Seq(
534-
"com.zaxxer" % "HikariCP" % "6.0.0" exclude ("org.slf4j", "*"),
534+
"com.zaxxer" % "HikariCP" % "6.2.1" exclude ("org.slf4j", "*"),
535535
"com.mysql" % "mysql-connector-j" % "9.1.0" % Test,
536536
"com.h2database" % "h2" % "2.3.232" % Test,
537537
"org.postgresql" % "postgresql" % "42.7.4" % Test,
538-
"org.xerial" % "sqlite-jdbc" % "3.46.1.3" % Test,
538+
"org.xerial" % "sqlite-jdbc" % "3.47.0.0" % Test,
539539
"com.microsoft.sqlserver" % "mssql-jdbc" % "7.4.1.jre11" % Test,
540540
"com.oracle.ojdbc" % "ojdbc8" % "19.3.0.0" % Test,
541541
"org.mockito" %% "mockito-scala-scalatest" % "1.17.14" % Test
@@ -598,14 +598,14 @@ def excludePaths(paths: Seq[String]) = {
598598
}
599599

600600
val scala_v_12 = "2.12.20"
601-
val scala_v_13 = "2.13.14"
601+
val scala_v_13 = "2.13.15"
602602
val scala_v_30 = "3.3.4"
603603

604604
val scalaCollectionCompatVersion = "2.12.0"
605605

606606
lazy val loggingSettings = Seq(
607607
libraryDependencies ++= Seq(
608-
"ch.qos.logback" % "logback-classic" % "1.5.8" % Test
608+
"ch.qos.logback" % "logback-classic" % "1.5.12" % Test
609609
)
610610
)
611611

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import sbt.*
22
import sbt.Keys.*
33

44
object Version {
5-
val zio = "2.1.9"
5+
val zio = "2.1.12"
66
}
77

88
sealed trait ExcludeTests

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.2
1+
sbt.version=1.10.5

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releas
55
addDependencyTreePlugin
66

77
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
8-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")
8+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
99
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
1010
addSbtPlugin("com.etsy" % "sbt-compile-quick-plugin" % "1.4.0")
1111
addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.10")
12-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
12+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")

0 commit comments

Comments
 (0)