Automatic merge back to main (#4035)

This commit is contained in:
matrixbot
2025-02-13 18:13:32 +01:00
committed by GitHub
4 changed files with 59 additions and 59 deletions
Generated
+27 -27
View File
@@ -3071,7 +3071,7 @@ dependencies = [
[[package]]
name = "mas-axum-utils"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"axum",
"axum-extra",
@@ -3104,7 +3104,7 @@ dependencies = [
[[package]]
name = "mas-cli"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"axum",
@@ -3175,7 +3175,7 @@ dependencies = [
[[package]]
name = "mas-config"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"camino",
@@ -3205,7 +3205,7 @@ dependencies = [
[[package]]
name = "mas-data-model"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"base64ct",
"chrono",
@@ -3226,7 +3226,7 @@ dependencies = [
[[package]]
name = "mas-email"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"async-trait",
"lettre",
@@ -3237,7 +3237,7 @@ dependencies = [
[[package]]
name = "mas-handlers"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"aide",
"anyhow",
@@ -3312,7 +3312,7 @@ dependencies = [
[[package]]
name = "mas-http"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"futures-util",
"headers",
@@ -3333,7 +3333,7 @@ dependencies = [
[[package]]
name = "mas-i18n"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"camino",
"icu_calendar",
@@ -3356,7 +3356,7 @@ dependencies = [
[[package]]
name = "mas-i18n-scan"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"camino",
"clap",
@@ -3370,7 +3370,7 @@ dependencies = [
[[package]]
name = "mas-iana"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"schemars",
"serde",
@@ -3378,7 +3378,7 @@ dependencies = [
[[package]]
name = "mas-iana-codegen"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3394,7 +3394,7 @@ dependencies = [
[[package]]
name = "mas-jose"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"base64ct",
"chrono",
@@ -3424,7 +3424,7 @@ dependencies = [
[[package]]
name = "mas-keystore"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"aead",
"base64ct",
@@ -3452,7 +3452,7 @@ dependencies = [
[[package]]
name = "mas-listener"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"bytes",
@@ -3476,7 +3476,7 @@ dependencies = [
[[package]]
name = "mas-matrix"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3486,7 +3486,7 @@ dependencies = [
[[package]]
name = "mas-matrix-synapse"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3503,7 +3503,7 @@ dependencies = [
[[package]]
name = "mas-oidc-client"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -3539,7 +3539,7 @@ dependencies = [
[[package]]
name = "mas-policy"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"mas-data-model",
@@ -3555,7 +3555,7 @@ dependencies = [
[[package]]
name = "mas-router"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"axum",
"serde",
@@ -3566,7 +3566,7 @@ dependencies = [
[[package]]
name = "mas-spa"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"camino",
"serde",
@@ -3575,7 +3575,7 @@ dependencies = [
[[package]]
name = "mas-storage"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"async-trait",
"chrono",
@@ -3597,7 +3597,7 @@ dependencies = [
[[package]]
name = "mas-storage-pg"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"async-trait",
"chrono",
@@ -3623,7 +3623,7 @@ dependencies = [
[[package]]
name = "mas-tasks"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"async-trait",
@@ -3654,7 +3654,7 @@ dependencies = [
[[package]]
name = "mas-templates"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -3684,7 +3684,7 @@ dependencies = [
[[package]]
name = "mas-tower"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"http",
"opentelemetry",
@@ -3930,7 +3930,7 @@ dependencies = [
[[package]]
name = "oauth2-types"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"assert_matches",
"chrono",
@@ -6041,7 +6041,7 @@ dependencies = [
[[package]]
name = "syn2mas"
version = "0.13.0"
version = "0.14.0-rc.0"
dependencies = [
"anyhow",
"bitflags",
+29 -29
View File
@@ -4,7 +4,7 @@ members = ["crates/*"]
resolver = "2"
# Updated in the CI with a `sed` command
package.version = "0.13.0"
package.version = "0.14.0-rc.0"
package.license = "AGPL-3.0-only"
package.authors = ["Element Backend Team"]
package.edition = "2021"
@@ -27,34 +27,34 @@ broken_intra_doc_links = "deny"
[workspace.dependencies]
# Workspace crates
mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.13.0" }
mas-cli = { path = "./crates/cli/", version = "=0.13.0" }
mas-config = { path = "./crates/config/", version = "=0.13.0" }
mas-data-model = { path = "./crates/data-model/", version = "=0.13.0" }
mas-email = { path = "./crates/email/", version = "=0.13.0" }
mas-graphql = { path = "./crates/graphql/", version = "=0.13.0" }
mas-handlers = { path = "./crates/handlers/", version = "=0.13.0" }
mas-http = { path = "./crates/http/", version = "=0.13.0" }
mas-i18n = { path = "./crates/i18n/", version = "=0.13.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.13.0" }
mas-iana = { path = "./crates/iana/", version = "=0.13.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.13.0" }
mas-jose = { path = "./crates/jose/", version = "=0.13.0" }
mas-keystore = { path = "./crates/keystore/", version = "=0.13.0" }
mas-listener = { path = "./crates/listener/", version = "=0.13.0" }
mas-matrix = { path = "./crates/matrix/", version = "=0.13.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.13.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.13.0" }
mas-policy = { path = "./crates/policy/", version = "=0.13.0" }
mas-router = { path = "./crates/router/", version = "=0.13.0" }
mas-spa = { path = "./crates/spa/", version = "=0.13.0" }
mas-storage = { path = "./crates/storage/", version = "=0.13.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.13.0" }
mas-tasks = { path = "./crates/tasks/", version = "=0.13.0" }
mas-templates = { path = "./crates/templates/", version = "=0.13.0" }
mas-tower = { path = "./crates/tower/", version = "=0.13.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=0.13.0" }
syn2mas = { path = "./crates/syn2mas", version = "=0.13.0" }
mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.14.0-rc.0" }
mas-cli = { path = "./crates/cli/", version = "=0.14.0-rc.0" }
mas-config = { path = "./crates/config/", version = "=0.14.0-rc.0" }
mas-data-model = { path = "./crates/data-model/", version = "=0.14.0-rc.0" }
mas-email = { path = "./crates/email/", version = "=0.14.0-rc.0" }
mas-graphql = { path = "./crates/graphql/", version = "=0.14.0-rc.0" }
mas-handlers = { path = "./crates/handlers/", version = "=0.14.0-rc.0" }
mas-http = { path = "./crates/http/", version = "=0.14.0-rc.0" }
mas-i18n = { path = "./crates/i18n/", version = "=0.14.0-rc.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.14.0-rc.0" }
mas-iana = { path = "./crates/iana/", version = "=0.14.0-rc.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.14.0-rc.0" }
mas-jose = { path = "./crates/jose/", version = "=0.14.0-rc.0" }
mas-keystore = { path = "./crates/keystore/", version = "=0.14.0-rc.0" }
mas-listener = { path = "./crates/listener/", version = "=0.14.0-rc.0" }
mas-matrix = { path = "./crates/matrix/", version = "=0.14.0-rc.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.14.0-rc.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.14.0-rc.0" }
mas-policy = { path = "./crates/policy/", version = "=0.14.0-rc.0" }
mas-router = { path = "./crates/router/", version = "=0.14.0-rc.0" }
mas-spa = { path = "./crates/spa/", version = "=0.14.0-rc.0" }
mas-storage = { path = "./crates/storage/", version = "=0.14.0-rc.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.14.0-rc.0" }
mas-tasks = { path = "./crates/tasks/", version = "=0.14.0-rc.0" }
mas-templates = { path = "./crates/templates/", version = "=0.14.0-rc.0" }
mas-tower = { path = "./crates/tower/", version = "=0.14.0-rc.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=0.14.0-rc.0" }
syn2mas = { path = "./crates/syn2mas", version = "=0.14.0-rc.0" }
# OpenAPI schema generation and validation
[workspace.dependencies.aide]
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@vector-im/syn2mas",
"version": "0.13.0",
"version": "0.14.0-rc.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@vector-im/syn2mas",
"version": "0.13.0",
"version": "0.14.0-rc.0",
"license": "AGPL-3.0-only",
"dependencies": {
"command-line-args": "^6.0.0",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@vector-im/syn2mas",
"version": "0.13.0",
"version": "0.14.0-rc.0",
"description": "A tool to migrate Synapse users and sessions to the Matrix Authentication Service",
"license": "AGPL-3.0-only",
"author": "Matrix.org",