Merge branch 'master' into update/ox-0.5.8

.github/labeler.yml

@@ -0,0 +1,14 @@
+version: 1
+labels:
+  - label: "automerge"
+    authors: ["softwaremill-ci"]
+    files:
+      - "build.sbt"
+      - "project/plugins.sbt"
+      - "project/build.properties"
+  - label: "dependency"
+    authors: ["softwaremill-ci"]
+    files:
+      - "build.sbt"
+      - "project/plugins.sbt"
+      - "project/build.properties"

.github/workflows/bootzooka-ci.yml

@@ -89,3 +89,41 @@ jobs:
 
       - name: Publish docker image
         run: sbt backend/docker:publish
+
+  # `automerge` label is attached iff there is exactly one file changed by steward and this file belongs to a
+  # whitelist specified by `labeler.yml`
+  label:
+    name: Attach automerge label
+    # only for PRs by softwaremill-ci
+    if: github.event.pull_request.user.login == 'softwaremill-ci'
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      # count number of files changed
+      - name: Count number of files changed
+        id: count-changed-files
+        run: |
+          N=$(git diff --name-only -r HEAD^1 HEAD | wc -w)
+          echo "changed_files_num=$N" >> $GITHUB_OUTPUT
+      - name: Launch labeler
+        # skip if more than one file changed
+        if: steps.count-changed-files.outputs.changed_files_num == 1
+        uses: srvaroa/labeler@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+  auto-merge:
+    name: Auto merge
+    # only for PRs by softwaremill-ci
+    if: github.event.pull_request.user.login == 'softwaremill-ci'
+    needs: [ verify, label ]
+    runs-on: ubuntu-24.04
+    steps:
+      - id: automerge
+        name: automerge
+        uses: "pascalgn/[email protected]"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: "squash"

.scalafmt.conf

@@ -1,3 +1,3 @@
-version=3.8.3
+version=3.8.4
 maxColumn = 140
 runner.dialect = scala3

build.sbt

@@ -11,16 +11,16 @@ import complete.DefaultParsers._
 
 val password4jVersion = "1.8.2"
 val sttpVersion = "3.10.1"
-val tapirVersion = "1.11.6"
+val tapirVersion = "1.11.12"
 val oxVersion = "0.5.8"
-val otelVersion = "1.43.0"
+val otelVersion = "1.46.0"
 val otelInstrumentationVersion = "2.8.0-alpha"
 
 val dbDependencies = Seq(
   "com.augustnagro" %% "magnum" % "1.3.1",
-  "org.postgresql" % "postgresql" % "42.7.4",
+  "org.postgresql" % "postgresql" % "42.7.5",
   "com.zaxxer" % "HikariCP" % "6.0.0",
-  "org.flywaydb" % "flyway-database-postgresql" % "10.20.0"
+  "org.flywaydb" % "flyway-database-postgresql" % "10.20.1"
 )
 
 val httpDependencies = Seq(
@@ -41,28 +41,28 @@ val observabilityDependencies = Seq(
 )
 
 val jsonDependencies = Seq(
-  "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.30.15",
+  "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.33.0",
   "com.softwaremill.sttp.tapir" %% "tapir-jsoniter-scala" % tapirVersion,
   "com.softwaremill.sttp.client3" %% "jsoniter" % sttpVersion
 )
 
 val loggingDependencies = Seq(
   "ch.qos.logback" % "logback-classic" % "1.5.11",
-  "org.slf4j" % "jul-to-slf4j" % "1.7.36", // forward e.g. otel logs which use JUL to SLF4J
+  "org.slf4j" % "jul-to-slf4j" % "2.0.16", // forward e.g. otel logs which use JUL to SLF4J
   "com.softwaremill.ox" %% "mdc-logback" % oxVersion,
   "org.slf4j" % "slf4j-jdk-platform-logging" % "2.0.7" % Runtime,
   "org.codehaus.janino" % "janino" % "3.1.12" % Runtime,
   "net.logstash.logback" % "logstash-logback-encoder" % "8.0" % Runtime
 )
 
 val configDependencies = Seq(
-  "com.github.pureconfig" %% "pureconfig-core" % "0.17.7"
+  "com.github.pureconfig" %% "pureconfig-core" % "0.17.8"
 )
 
 val baseDependencies = Seq(
   "com.softwaremill.ox" %% "core" % oxVersion,
   "com.softwaremill.quicklens" %% "quicklens" % "1.9.9",
-  "com.softwaremill.macwire" %% "macros" % "2.6.2" % Provided
+  "com.softwaremill.macwire" %% "macros" % "2.6.4" % Provided
 )
 
 val apiDocsDependencies = Seq(
@@ -91,7 +91,7 @@ lazy val generateOpenAPIDescription = taskKey[Unit]("Generate the OpenAPI descri
 
 lazy val commonSettings = Seq(
   organization := "com.softwaremill.bootzooka",
-  scalaVersion := "3.5.0",
+  scalaVersion := "3.5.2",
   uiDirectory := (ThisBuild / baseDirectory).value / uiProjectName,
   updateYarn := {
     streams.value.log("Updating npm/yarn dependencies")

project/plugins.sbt

@@ -1,11 +1,11 @@
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
 
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
 
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.3")