Merge branch 'master' into update/pekko-connectors-cassandra-1.1.0

zio · Jan 21, 2025 · 3b3af50 · 3b3af50
2 parents cf70bda + a079f3f
commit 3b3af50
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,11 +29,13 @@ jobs:
           key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
 
       - name: Setup Java
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: temurin
           java-version: '17'
           check-latest: true
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
       - name: Check scalafmt
         run: sbt 'scalafmtCheckAll' # https://scalameta.org/scalafmt/docs/installation.html#task-keys
 
@@ -87,11 +89,13 @@ jobs:
         key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
 
     - name: Setup Java
-      uses: actions/setup-java@v4.5.0
+      uses: actions/setup-java@v4.6.0
       with:
         distribution: temurin
         java-version: '17'
         check-latest: true
+    - name: Setup sbt
+      uses: sbt/setup-sbt@v1
 
     - name: Build modules
       run: |
@@ -110,11 +114,13 @@ jobs:
     steps:
       - uses: actions/[email protected]
       - name: Setup Java
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: temurin
           java-version: '11'
           check-latest: true
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
       - run: |
           sbt ++2.12.x -Dquill.scala.version=2.12.x -Dquill.macro.log=false ci-release
           sbt ++2.13.x -Dquill.scala.version=2.13.x -Dquill.macro.log=false ci-release

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.71.0
+        uses: scala-steward-org/scala-steward-action@v2.74.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
@@ -22,11 +22,13 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v4.5.0
+      uses: actions/setup-java@v4.6.0
       with:
         distribution: temurin
         java-version: 17
         check-latest: true
+    - name: Setup sbt
+      uses: sbt/setup-sbt@v1
     - name: Check if the README file is up to date
       run: sbt  docs/checkReadme
     - name: Check if the site workflow is up to date
@@ -43,11 +45,13 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v4.5.0
+      uses: actions/setup-java@v4.6.0
       with:
         distribution: temurin
         java-version: 17
         check-latest: true
+    - name: Setup sbt
+      uses: sbt/setup-sbt@v1
     - name: Setup NodeJs
       uses: actions/setup-node@v3
       with:
@@ -68,11 +72,13 @@ jobs:
         ref: ${{ github.head_ref }}
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v4.5.0
+      uses: actions/setup-java@v4.6.0
       with:
         distribution: temurin
         java-version: 17
         check-latest: true
+    - name: Setup sbt
+      uses: sbt/setup-sbt@v1
     - name: Generate Readme
       run: sbt  docs/generateReadme
     - name: Commit Changes
@@ -82,7 +88,7 @@ jobs:
         git add README.md
         git commit -m "Update README.md" || echo "No changes to commit"
     - name: Create Pull Request
-      uses: peter-evans/[email protected].5
+      uses: peter-evans/[email protected].6
       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
@@ -205,7 +205,7 @@ lazy val `quill-engine` =
         ("com.github.takayahilton"     %% "sql-formatter" % "1.2.1").cross(CrossVersion.for3Use2_13),
         "io.suzaku"                    %% "boopickle"     % "1.5.0",
         "com.lihaoyi"                  %% "pprint"        % "0.9.0",
-        "com.github.ben-manes.caffeine" % "caffeine"      % "3.1.8"
+        "com.github.ben-manes.caffeine" % "caffeine"      % "3.2.0"
       ),
       coverageExcludedPackages := "<empty>;.*AstPrinter;.*Using;io.getquill.Model;io.getquill.ScalarTag;io.getquill.QuotationTag"
     )
@@ -423,8 +423,8 @@ lazy val `quill-jdbc-zio` =
     .settings(
       libraryDependencies ++= Seq(
         // Needed for PGObject in JsonExtensions but not necessary if user is not using postgres
-        "org.postgresql" % "postgresql" % "42.7.4" % "provided",
-        "dev.zio"       %% "zio-json"   % "0.7.3"
+        "org.postgresql" % "postgresql" % "42.7.5" % "provided",
+        "dev.zio"       %% "zio-json"   % "0.7.4"
       ),
       Test / testGrouping := {
         (Test / definedTests).value map { test =>
@@ -511,7 +511,7 @@ lazy val `quill-orientdb` =
     .settings(
       Test / fork := true,
       libraryDependencies ++= Seq(
-        "com.orientechnologies" % "orientdb-graphdb" % "3.2.36"
+        "com.orientechnologies" % "orientdb-graphdb" % "3.2.37"
       )
     )
     .dependsOn(
@@ -535,8 +535,8 @@ lazy val jdbcTestingLibraries = Seq(
     "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.47.1.0"    % Test,
+    "org.postgresql"          % "postgresql"              % "42.7.5"      % Test,
+    "org.xerial"              % "sqlite-jdbc"             % "3.47.2.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
@@ -606,7 +606,7 @@ val scalaCollectionCompatVersion = "2.12.0"
 
 lazy val loggingSettings = Seq(
   libraryDependencies ++= Seq(
-    "ch.qos.logback" % "logback-classic" % "1.5.12" % Test
+    "ch.qos.logback" % "logback-classic" % "1.5.16" % 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.13"
+  val zio = "2.1.14"
 }
 
 sealed trait ExcludeTests

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.6
+sbt.version=1.10.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,9 +4,9 @@ resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releas
 
 addDependencyTreePlugin
 
-addSbtPlugin("org.scalameta"  % "sbt-scalafmt"             % "2.5.2")
+addSbtPlugin("org.scalameta"  % "sbt-scalafmt"             % "2.5.4")
 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.9.0")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release"           % "1.9.2")