Merge branch 'master' into update/doobie-core-1.0.0-RC6

zio · Nov 20, 2024 · 5dcdf06 · 5dcdf06
2 parents 1d8c0ba + 8e43a94
commit 5dcdf06
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.2.2
       - name: Cache sbt
         uses: actions/cache@v4
         with:
@@ -29,7 +29,7 @@ jobs:
           key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
 
       - name: Setup Java
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: temurin
           java-version: '17'
@@ -77,7 +77,7 @@ jobs:
     name: Build ${{matrix.scala_short_dot}} - ${{matrix.module}}
 
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.2.2
     - name: Cache sbt
       uses: actions/cache@v4
       with:
@@ -87,7 +87,7 @@ jobs:
         key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
 
     - name: Setup Java
-      uses: actions/setup-java@v4.2.2
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: '17'
@@ -108,9 +108,9 @@ jobs:
       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
       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
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.2.2
       - name: Setup Java
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: temurin
           java-version: '11'

diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml
@@ -13,7 +13,7 @@ jobs:
     name: Scala Steward
     steps:
       - name: Scala Steward
-        uses: scala-steward-org/scala-steward-action@v2.69.0
+        uses: scala-steward-org/scala-steward-action@v2.71.0
         with:
           github-app-id: ${{ secrets.SCALA_STEWARD_GITHUB_APP_ID }}
           github-app-installation-id: ${{ secrets.SCALA_STEWARD_GITHUB_APP_INSTALLATION_ID }}

diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -18,11 +18,11 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4.2.2
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -39,11 +39,11 @@ jobs:
     if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4.2.2
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -63,12 +63,12 @@ jobs:
     if: ${{ (github.event_name == 'push') || ((github.event_name == 'release') && (github.event.action == 'published')) }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4.2.2
       with:
         ref: ${{ github.head_ref }}
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -82,7 +82,7 @@ jobs:
         git add README.md
         git commit -m "Update README.md" || echo "No changes to commit"
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4.2.3
+      uses: peter-evans/create-pull-request@v7.0.5
       with:
         body: |-
           Autogenerated changes after running the `sbt docs/generateReadme` command of the [zio-sbt-website](https://zio.dev/zio-sbt) plugin.

diff --git a/build.sbt b/build.sbt
@@ -216,7 +216,7 @@ lazy val `quill-core` =
     .settings(
       libraryDependencies ++= Seq(
         "com.typesafe"                % "config"        % "1.4.3",
-        "dev.zio"                    %% "zio-logging"   % "2.3.1",
+        "dev.zio"                    %% "zio-logging"   % "2.4.0",
         "dev.zio"                    %% "zio"           % Version.zio,
         "dev.zio"                    %% "zio-streams"   % Version.zio,
         "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
@@ -510,7 +510,7 @@ lazy val `quill-orientdb` =
     .settings(
       Test / fork := true,
       libraryDependencies ++= Seq(
-        "com.orientechnologies" % "orientdb-graphdb" % "3.2.33"
+        "com.orientechnologies" % "orientdb-graphdb" % "3.2.35"
       )
     )
     .dependsOn(
@@ -531,11 +531,11 @@ lazy val `quill-test-kit` =
 
 lazy val jdbcTestingLibraries = Seq(
   libraryDependencies ++= Seq(
-    "com.zaxxer"              % "HikariCP"                % "5.1.0" exclude ("org.slf4j", "*"),
-    "com.mysql"               % "mysql-connector-j"       % "9.0.0"       % Test,
+    "com.zaxxer"              % "HikariCP"                % "6.2.1" exclude ("org.slf4j", "*"),
+    "com.mysql"               % "mysql-connector-j"       % "9.1.0"       % Test,
     "com.h2database"          % "h2"                      % "2.3.232"     % Test,
     "org.postgresql"          % "postgresql"              % "42.7.4"      % Test,
-    "org.xerial"              % "sqlite-jdbc"             % "3.46.1.0"    % Test,
+    "org.xerial"              % "sqlite-jdbc"             % "3.47.0.0"    % Test,
     "com.microsoft.sqlserver" % "mssql-jdbc"              % "7.4.1.jre11" % Test,
     "com.oracle.ojdbc"        % "ojdbc8"                  % "19.3.0.0"    % Test,
     "org.mockito"            %% "mockito-scala-scalatest" % "1.17.14"     % Test
@@ -598,14 +598,14 @@ def excludePaths(paths: Seq[String]) = {
 }
 
 val scala_v_12 = "2.12.20"
-val scala_v_13 = "2.13.14"
-val scala_v_30 = "3.3.3"
+val scala_v_13 = "2.13.15"
+val scala_v_30 = "3.3.4"
 
 val scalaCollectionCompatVersion = "2.12.0"
 
 lazy val loggingSettings = Seq(
   libraryDependencies ++= Seq(
-    "ch.qos.logback" % "logback-classic" % "1.5.8" % Test
+    "ch.qos.logback" % "logback-classic" % "1.5.12" % Test
   )
 )
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,7 +2,7 @@ import sbt.*
 import sbt.Keys.*
 
 object Version {
-  val zio = "2.1.9"
+  val zio = "2.1.12"
 }
 
 sealed trait ExcludeTests

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.5
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,8 +5,8 @@ resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releas
 addDependencyTreePlugin
 
 addSbtPlugin("org.scalameta"  % "sbt-scalafmt"             % "2.5.2")
-addSbtPlugin("org.scoverage"  % "sbt-scoverage"            % "2.2.0")
+addSbtPlugin("org.scoverage"  % "sbt-scoverage"            % "2.2.2")
 addSbtPlugin("com.typesafe"   % "sbt-mima-plugin"          % "1.1.4")
 addSbtPlugin("com.etsy"       % "sbt-compile-quick-plugin" % "1.4.0")
 addSbtPlugin("dev.zio"        % "zio-sbt-website"          % "0.3.10")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release"           % "1.6.1")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release"           % "1.9.0")