Skip to content

Commit

Permalink
chore: Patch dependency updates (#318)
Browse files Browse the repository at this point in the history 
## About this PR
Updates:

* 📦 [com.softwaremill.sttp.client3:zio](https://github.com/zio/zio) from
`3.10.1` to `3.10.2`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio/releases/tag/v2.1.14) - [Version
Diff](zio/zio@v2.1.13...v2.1.14)
* 📦
[com.softwaremill.sttp.tapir:tapir-json-zio](https://github.com/softwaremill/tapir)
from `1.11.10` to `1.11.12`
+ 📜 [GitHub Release
Notes](https://github.com/softwaremill/tapir/releases/tag/v1.11.12) -
[Version
Diff](softwaremill/tapir@v1.11.10...v1.11.12)
* 📦
[com.softwaremill.sttp.tapir:tapir-openapi-docs](https://github.com/softwaremill/tapir)
from `1.11.10` to `1.11.12`
+ 📜 [GitHub Release
Notes](https://github.com/softwaremill/tapir/releases/tag/v1.11.12) -
[Version
Diff](softwaremill/tapir@v1.11.10...v1.11.12)
* 📦
[com.softwaremill.sttp.tapir:tapir-refined](https://github.com/softwaremill/tapir)
from `1.11.10` to `1.11.12`
+ 📜 [GitHub Release
Notes](https://github.com/softwaremill/tapir/releases/tag/v1.11.12) -
[Version
Diff](softwaremill/tapir@v1.11.10...v1.11.12)
* 📦
[com.softwaremill.sttp.tapir:tapir-swagger-ui-bundle](https://github.com/softwaremill/tapir)
from `1.11.10` to `1.11.12`
+ 📜 [GitHub Release
Notes](https://github.com/softwaremill/tapir/releases/tag/v1.11.12) -
[Version
Diff](softwaremill/tapir@v1.11.10...v1.11.12)
* 📦
[com.softwaremill.sttp.tapir:tapir-zio-http-server](https://github.com/softwaremill/tapir)
from `1.11.10` to `1.11.12`
+ 📜 [GitHub Release
Notes](https://github.com/softwaremill/tapir/releases/tag/v1.11.12) -
[Version
Diff](softwaremill/tapir@v1.11.10...v1.11.12)
* 📦
[com.softwaremill.sttp.tapir:tapir-zio-metrics](https://github.com/softwaremill/tapir)
from `1.11.10` to `1.11.12`
+ 📜 [GitHub Release
Notes](https://github.com/softwaremill/tapir/releases/tag/v1.11.12) -
[Version
Diff](softwaremill/tapir@v1.11.10...v1.11.12)
* 📦 [dev.zio:zio](https://github.com/zio/zio) from `2.1.13` to `2.1.14`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio/releases/tag/v2.1.14) - [Version
Diff](zio/zio@v2.1.13...v2.1.14)
* 📦 [dev.zio:zio-config](https://github.com/zio/zio-config) from `4.0.2`
to `4.0.3`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio-config/releases/tag/v4.0.3) - [Version
Diff](zio/zio-config@v4.0.2...v4.0.3)
* 📦 [dev.zio:zio-config-magnolia](https://github.com/zio/zio-config)
from `4.0.2` to `4.0.3`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio-config/releases/tag/v4.0.3) - [Version
Diff](zio/zio-config@v4.0.2...v4.0.3)
* 📦 [dev.zio:zio-config-typesafe](https://github.com/zio/zio-config)
from `4.0.2` to `4.0.3`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio-config/releases/tag/v4.0.3) - [Version
Diff](zio/zio-config@v4.0.2...v4.0.3)
* 📦 [dev.zio:zio-streams](https://github.com/zio/zio) from `2.1.13` to
`2.1.14`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio/releases/tag/v2.1.14) - [Version
Diff](zio/zio@v2.1.13...v2.1.14)
* 📦 [dev.zio:zio-test](https://github.com/zio/zio) from `2.1.13` to
`2.1.14`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio/releases/tag/v2.1.14) - [Version
Diff](zio/zio@v2.1.13...v2.1.14)
* 📦 [dev.zio:zio-test-junit](https://github.com/zio/zio) from `2.1.13`
to `2.1.14`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio/releases/tag/v2.1.14) - [Version
Diff](zio/zio@v2.1.13...v2.1.14)
* 📦 [dev.zio:zio-test-magnolia](https://github.com/zio/zio) from
`2.1.13` to `2.1.14`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio/releases/tag/v2.1.14) - [Version
Diff](zio/zio@v2.1.13...v2.1.14)
* 📦 [dev.zio:zio-test-sbt](https://github.com/zio/zio) from `2.1.13` to
`2.1.14`
+ 📜 [GitHub Release
Notes](https://github.com/zio/zio/releases/tag/v2.1.14) - [Version
Diff](zio/zio@v2.1.13...v2.1.14)
* 📦 [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from
`11.1.0` to `11.1.1`
* 📦 [org.scala-sbt:sbt](https://github.com/sbt/sbt) from `1.10.6` to
`1.10.7`
+ 📜 [GitHub Release
Notes](https://github.com/sbt/sbt/releases/tag/v1.10.7) - [Version
Diff](sbt/sbt@v1.10.6...v1.10.7)
* 📦 [org.scala-sbt:scripted-plugin](https://github.com/sbt/sbt) from
`1.10.6` to `1.10.7`
+ 📜 [GitHub Release
Notes](https://github.com/sbt/sbt/releases/tag/v1.10.7) - [Version
Diff](sbt/sbt@v1.10.6...v1.10.7)
* 📦
[org.scalameta:sbt-scalafmt](https://github.com/scalameta/sbt-scalafmt)
from `2.5.2` to `2.5.3`
+ 📜 [GitHub Release
Notes](https://github.com/scalameta/sbt-scalafmt/releases/tag/v2.5.3) -
[Version
Diff](scalameta/sbt-scalafmt@v2.5.2...v2.5.3)
* 📦 [org.scalameta:scalafmt-core](https://github.com/scalameta/scalafmt)
from `3.8.3` to `3.8.4`
+ 📜 [GitHub Release
Notes](https://github.com/scalameta/scalafmt/releases/tag/v3.8.4) -
[Version
Diff](scalameta/scalafmt@v3.8.3...v3.8.4)

## Usage
✅ **Please merge!**

I'll automatically update this PR to resolve conflicts as long as you
don't change it yourself.

If you have any feedback, just mention me in the comments below.

Configure Scala Steward for your repository with a
[`.scala-steward.conf`](https://github.com/scala-steward-org/scala-steward/blob/8929fadb6f535472bd63397b1cb55a835fa1b5cb/docs/repo-specific-configuration.md)
file.

_Have a fantastic day writing Scala!_

<details>
<summary>🔍 Files still referring to the old version numbers</summary>

The following files still refer to the old version numbers.
You might want to review and update them manually.
```
CHANGELOG.md
.git-blame-ignore-revs
```
</details>
<details>
<summary>⚙ Adjust future updates</summary>

Add these to your `.scala-steward.conf` file to ignore future updates of
these dependencies:
```
updates.ignore = [
  { groupId = "com.softwaremill.sttp.client3", artifactId = "zio" },
  { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-json-zio" },
  { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-openapi-docs" },
  { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-refined" },
  { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-swagger-ui-bundle" },
  { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-zio-http-server" },
  { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-zio-metrics" },
  { groupId = "dev.zio", artifactId = "zio" },
  { groupId = "dev.zio", artifactId = "zio-config" },
  { groupId = "dev.zio", artifactId = "zio-config-magnolia" },
  { groupId = "dev.zio", artifactId = "zio-config-typesafe" },
  { groupId = "dev.zio", artifactId = "zio-streams" },
  { groupId = "dev.zio", artifactId = "zio-test" },
  { groupId = "dev.zio", artifactId = "zio-test-junit" },
  { groupId = "dev.zio", artifactId = "zio-test-magnolia" },
  { groupId = "dev.zio", artifactId = "zio-test-sbt" },
  { groupId = "org.flywaydb", artifactId = "flyway-core" },
  { groupId = "org.scala-sbt", artifactId = "sbt" },
  { groupId = "org.scala-sbt", artifactId = "scripted-plugin" },
  { groupId = "org.scalameta", artifactId = "sbt-scalafmt" },
  { groupId = "org.scalameta", artifactId = "scalafmt-core" }
]
```
Or, add these to slow down future updates of these dependencies:
```
dependencyOverrides = [
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.softwaremill.sttp.client3", artifactId = "zio" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-json-zio" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-openapi-docs" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-refined" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-swagger-ui-bundle" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-zio-http-server" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-zio-metrics" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio-config" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio-config-magnolia" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio-config-typesafe" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio-streams" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio-test" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio-test-junit" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio-test-magnolia" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "dev.zio", artifactId = "zio-test-sbt" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "org.flywaydb", artifactId = "flyway-core" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "org.scala-sbt", artifactId = "sbt" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "org.scala-sbt", artifactId = "scripted-plugin" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "org.scalameta", artifactId = "sbt-scalafmt" }
  },
  {
    pullRequests = { frequency = "30 days" },
    dependency = { groupId = "org.scalameta", artifactId = "scalafmt-core" }
  }
]
```
</details>

<sup>
labels: library-update, test-library-update, sbt-plugin-update,
early-semver-patch, semver-spec-patch, version-scheme:early-semver,
old-version-remains, commit-count:n:10
</sup>

<!-- scala-steward = {
  "Update" : {
    "Grouped" : {
      "name" : "patch",
      "title" : "chore: Patch dependency updates",
      "updates" : [
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "com.softwaremill.sttp.client3",
                "artifactId" : {
                  "name" : "zio",
                  "maybeCrossName" : "zio_3"
                },
                "version" : "3.10.1",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "3.10.2"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "com.softwaremill.sttp.tapir",
                "artifactId" : {
                  "name" : "tapir-json-zio",
                  "maybeCrossName" : "tapir-json-zio_3"
                },
                "version" : "1.11.10",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "1.11.12"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "com.softwaremill.sttp.tapir",
                "artifactId" : {
                  "name" : "tapir-openapi-docs",
                  "maybeCrossName" : "tapir-openapi-docs_3"
                },
                "version" : "1.11.10",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "1.11.12"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "com.softwaremill.sttp.tapir",
                "artifactId" : {
                  "name" : "tapir-refined",
                  "maybeCrossName" : "tapir-refined_3"
                },
                "version" : "1.11.10",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "1.11.12"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "com.softwaremill.sttp.tapir",
                "artifactId" : {
                  "name" : "tapir-swagger-ui-bundle",
                  "maybeCrossName" : "tapir-swagger-ui-bundle_3"
                },
                "version" : "1.11.10",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "1.11.12"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "com.softwaremill.sttp.tapir",
                "artifactId" : {
                  "name" : "tapir-zio-http-server",
                  "maybeCrossName" : "tapir-zio-http-server_3"
                },
                "version" : "1.11.10",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "1.11.12"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "com.softwaremill.sttp.tapir",
                "artifactId" : {
                  "name" : "tapir-zio-metrics",
                  "maybeCrossName" : "tapir-zio-metrics_3"
                },
                "version" : "1.11.10",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "1.11.12"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio",
                  "maybeCrossName" : "zio_3"
                },
                "version" : "2.1.13",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "2.1.14"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio-config",
                  "maybeCrossName" : "zio-config_3"
                },
                "version" : "4.0.2",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "4.0.3"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio-config-magnolia",
                  "maybeCrossName" : "zio-config-magnolia_3"
                },
                "version" : "4.0.2",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "4.0.3"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio-config-typesafe",
                  "maybeCrossName" : "zio-config-typesafe_3"
                },
                "version" : "4.0.2",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "4.0.3"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio-streams",
                  "maybeCrossName" : "zio-streams_3"
                },
                "version" : "2.1.13",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "2.1.14"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio-test",
                  "maybeCrossName" : "zio-test_3"
                },
                "version" : "2.1.13",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : "test"
              }
            ],
            "newerVersions" : [
              "2.1.14"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio-test-junit",
                  "maybeCrossName" : "zio-test-junit_3"
                },
                "version" : "2.1.13",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : "test"
              }
            ],
            "newerVersions" : [
              "2.1.14"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio-test-magnolia",
                  "maybeCrossName" : "zio-test-magnolia_3"
                },
                "version" : "2.1.13",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : "test"
              }
            ],
            "newerVersions" : [
              "2.1.14"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "dev.zio",
                "artifactId" : {
                  "name" : "zio-test-sbt",
                  "maybeCrossName" : "zio-test-sbt_3"
                },
                "version" : "2.1.13",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : "test"
              }
            ],
            "newerVersions" : [
              "2.1.14"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "org.flywaydb",
                "artifactId" : {
                  "name" : "flyway-core",
                  "maybeCrossName" : null
                },
                "version" : "11.1.0",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "11.1.1"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "org.scala-sbt",
                "artifactId" : {
                  "name" : "sbt",
                  "maybeCrossName" : null
                },
                "version" : "1.10.6",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "1.10.7"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "org.scala-sbt",
                "artifactId" : {
                  "name" : "scripted-plugin",
                  "maybeCrossName" : "scripted-plugin_2.12"
                },
                "version" : "1.10.6",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "1.10.7"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "org.scalameta",
                "artifactId" : {
                  "name" : "sbt-scalafmt",
                  "maybeCrossName" : null
                },
                "version" : "2.5.2",
                "sbtVersion" : "1.0",
                "scalaVersion" : "2.12",
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "2.5.3"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        },
        {
          "ForArtifactId" : {
            "crossDependency" : [
              {
                "groupId" : "org.scalameta",
                "artifactId" : {
                  "name" : "scalafmt-core",
                  "maybeCrossName" : "scalafmt-core_2.13"
                },
                "version" : "3.8.3",
                "sbtVersion" : null,
                "scalaVersion" : null,
                "configurations" : null
              }
            ],
            "newerVersions" : [
              "3.8.4"
            ],
            "newerGroupId" : null,
            "newerArtifactId" : null
          }
        }
      ]
    }
  },
  "Labels" : [
    "library-update",
    "test-library-update",
    "sbt-plugin-update",
    "early-semver-patch",
    "semver-spec-patch",
    "version-scheme:early-semver",
    "old-version-remains",
    "commit-count:n:10"
  ]
} -->

---------

Co-authored-by: Marcin Procyk <[email protected]>
  • Loading branch information
@daschbot @mpro7
daschbot and mpro7 authored Jan 20, 2025
1 parent 39116d8 commit 363c6e4
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ c09b8dba648055f0ee47a48ccd5bc203ddf8d424

# Scala Steward: Reformat with scalafmt 3.8.3
64daf9d365128e01beb81c3e578e0c998fc10165

# Scala Steward: Reformat with scalafmt 3.8.4
d62360db7af14a923a04f70bc44a175d2a560832
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.3"
version = "3.8.4"
runner.dialect = scala3
maxColumn = 120
align.preset = most
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ addCommandAlias("fmtCheck", "scalafmtCheck; Test / scalafmtCheck; integration/Te
addCommandAlias("headerCreateAll", "; all root/headerCreate Test/headerCreate; integration/Test/headerCreate")
addCommandAlias("headerCheckAll", "; all root/headerCheck Test/headerCheck; integration/Test/headerCheck")

val flywayVersion = "11.1.0"
val flywayVersion = "11.1.1"
val hikariVersion = "6.2.1"
val quillVersion = "4.8.6"
val sipiVersion = "v31.0.0"
val sqliteVersion = "3.47.2.0"
val tapirVersion = "1.11.10"
val tapirVersion = "1.11.12"
val testContainersVersion = "1.20.4"
val zioConfigVersion = "4.0.2"
val zioConfigVersion = "4.0.3"
val zioJsonVersion = "0.7.4"
val zioLoggingVersion = "2.4.0"
val zioMetricsConnectorsVersion = "2.3.1"
val zioMockVersion = "1.0.0-RC12"
val zioNioVersion = "2.0.2"
val zioPreludeVersion = "1.0.0-RC36"
val zioSchemaVersion = "1.5.0"
val zioVersion = "2.1.13"
val zioVersion = "2.1.14"

val gitCommit = ("git rev-parse HEAD" !!).trim
val gitVersion = ("git describe --tag --dirty --abbrev=7 --always " !!).trim
Expand Down Expand Up @@ -120,7 +120,7 @@ lazy val root = (project in file("."))
"dev.zio" %% "zio-metrics-connectors" % zioMetricsConnectorsVersion,
"dev.zio" %% "zio-metrics-connectors-prometheus" % zioMetricsConnectorsVersion,
"eu.timepit" %% "refined" % "0.11.3",
"com.softwaremill.sttp.client3" %% "zio" % "3.10.1",
"com.softwaremill.sttp.client3" %% "zio" % "3.10.2",

// csv for reports
"com.github.tototoshi" %% "scala-csv" % "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.6
sbt.version=1.10.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")
31 changes: 14 additions & 17 deletions src/main/scala/swiss/dasch/api/ProjectsEndpointsHandler.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,23 @@ final case class ProjectsEndpointsHandler(
},
)

private val getProjectsAssetsInfoEndpoint: ZServerEndpoint[Any, Any] = projectEndpoints.getProjectsAssetsInfo
.serverLogic(userSession =>
(shortcode, assetId) => {
val ref = AssetRef(assetId, shortcode)
authorizationHandler.ensureProjectReadable(userSession, shortcode) *>
assetInfoService
.findByAssetRef(ref)
.some
.mapBoth(
assetRefNotFoundOrServerError(_, ref),
AssetInfoResponse.from,
)
},
)
private val getProjectsAssetsInfoEndpoint: ZServerEndpoint[Any, Any] =
projectEndpoints.getProjectsAssetsInfo.serverLogic { userSession => (shortcode, assetId) =>
val ref = AssetRef(assetId, shortcode)
authorizationHandler.ensureProjectReadable(userSession, shortcode) *>
assetInfoService
.findByAssetRef(ref)
.some
.mapBoth(
assetRefNotFoundOrServerError(_, ref),
AssetInfoResponse.from,
)
}

private val getProjectsAssetsOriginalEndpoint: ZServerEndpoint[Any, ZioStreams] =
projectEndpoints.getProjectsAssetsOriginal
.serverLogic(userSession =>
(shortcode, assetId) => {
(shortcode, assetId) =>
for {
ref <- ZIO.succeed(AssetRef(assetId, shortcode))
assetInfo <- assetInfoService.findByAssetRef(ref).some.mapError(assetRefNotFoundOrServerError(_, ref))
Expand All @@ -129,8 +127,7 @@ final case class ProjectsEndpointsHandler(
s"attachment; filename*=UTF-8''${filenameEncoded}", // Content-Disposition
assetInfo.metadata.originalMimeType.map(m => m.stringValue).getOrElse("application/octet-stream"),
ZStream.fromFile(assetInfo.original.file.toFile),
)
},
),
)

private val postProjectAssetEndpoint: ZServerEndpoint[Any, ZioStreams] = projectEndpoints.postProjectAsset
Expand Down

0 comments on commit 363c6e4

Please sign in to comment.