Automatic merge back to main (#5593)

This commit is contained in:
Quentin Gliech
2026-03-31 19:01:43 +02:00
committed by GitHub
2 changed files with 58 additions and 58 deletions

56
Cargo.lock generated
View File

@@ -3062,7 +3062,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-axum-utils" name = "mas-axum-utils"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -3096,7 +3096,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-cli" name = "mas-cli"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -3171,7 +3171,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-config" name = "mas-config"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"camino", "camino",
@@ -3202,7 +3202,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-context" name = "mas-context"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"console", "console",
"opentelemetry", "opentelemetry",
@@ -3218,7 +3218,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-data-model" name = "mas-data-model"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"base64ct", "base64ct",
"chrono", "chrono",
@@ -3239,7 +3239,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-email" name = "mas-email"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"lettre", "lettre",
@@ -3250,7 +3250,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-handlers" name = "mas-handlers"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"aide", "aide",
"anyhow", "anyhow",
@@ -3331,7 +3331,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-http" name = "mas-http"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"headers", "headers",
@@ -3352,7 +3352,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-i18n" name = "mas-i18n"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"camino", "camino",
"icu_calendar", "icu_calendar",
@@ -3374,7 +3374,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-i18n-scan" name = "mas-i18n-scan"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"camino", "camino",
"clap", "clap",
@@ -3388,7 +3388,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-iana" name = "mas-iana"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"schemars 0.9.0", "schemars 0.9.0",
"serde", "serde",
@@ -3396,7 +3396,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-iana-codegen" name = "mas-iana-codegen"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -3413,7 +3413,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-jose" name = "mas-jose"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"base64ct", "base64ct",
"chrono", "chrono",
@@ -3443,7 +3443,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-keystore" name = "mas-keystore"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"aead", "aead",
"base64ct", "base64ct",
@@ -3471,7 +3471,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-listener" name = "mas-listener"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@@ -3495,7 +3495,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-matrix" name = "mas-matrix"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -3505,7 +3505,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-matrix-synapse" name = "mas-matrix-synapse"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -3522,7 +3522,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-oidc-client" name = "mas-oidc-client"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"async-trait", "async-trait",
@@ -3558,7 +3558,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-policy" name = "mas-policy"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
@@ -3575,7 +3575,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-router" name = "mas-router"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"axum", "axum",
"serde", "serde",
@@ -3586,7 +3586,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-spa" name = "mas-spa"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"camino", "camino",
"serde", "serde",
@@ -3595,7 +3595,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-storage" name = "mas-storage"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"chrono", "chrono",
@@ -3617,7 +3617,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-storage-pg" name = "mas-storage-pg"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"chrono", "chrono",
@@ -3647,7 +3647,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-tasks" name = "mas-tasks"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -3679,7 +3679,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-templates" name = "mas-templates"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
@@ -3711,7 +3711,7 @@ dependencies = [
[[package]] [[package]]
name = "mas-tower" name = "mas-tower"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"http", "http",
"opentelemetry", "opentelemetry",
@@ -3964,7 +3964,7 @@ dependencies = [
[[package]] [[package]]
name = "oauth2-types" name = "oauth2-types"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"base64ct", "base64ct",
@@ -6060,7 +6060,7 @@ dependencies = [
[[package]] [[package]]
name = "syn2mas" name = "syn2mas"
version = "1.14.0" version = "1.15.0-rc.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",

View File

@@ -9,7 +9,7 @@ members = ["crates/*"]
resolver = "2" resolver = "2"
# Updated in the CI with a `sed` command # Updated in the CI with a `sed` command
package.version = "1.14.0" package.version = "1.15.0-rc.0"
package.license = "AGPL-3.0-only OR LicenseRef-Element-Commercial" package.license = "AGPL-3.0-only OR LicenseRef-Element-Commercial"
package.authors = ["Element Backend Team"] package.authors = ["Element Backend Team"]
package.edition = "2024" package.edition = "2024"
@@ -34,35 +34,35 @@ broken_intra_doc_links = "deny"
[workspace.dependencies] [workspace.dependencies]
# Workspace crates # Workspace crates
mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.14.0" } mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.15.0-rc.0" }
mas-cli = { path = "./crates/cli/", version = "=1.14.0" } mas-cli = { path = "./crates/cli/", version = "=1.15.0-rc.0" }
mas-config = { path = "./crates/config/", version = "=1.14.0" } mas-config = { path = "./crates/config/", version = "=1.15.0-rc.0" }
mas-context = { path = "./crates/context/", version = "=1.14.0" } mas-context = { path = "./crates/context/", version = "=1.15.0-rc.0" }
mas-data-model = { path = "./crates/data-model/", version = "=1.14.0" } mas-data-model = { path = "./crates/data-model/", version = "=1.15.0-rc.0" }
mas-email = { path = "./crates/email/", version = "=1.14.0" } mas-email = { path = "./crates/email/", version = "=1.15.0-rc.0" }
mas-graphql = { path = "./crates/graphql/", version = "=1.14.0" } mas-graphql = { path = "./crates/graphql/", version = "=1.15.0-rc.0" }
mas-handlers = { path = "./crates/handlers/", version = "=1.14.0" } mas-handlers = { path = "./crates/handlers/", version = "=1.15.0-rc.0" }
mas-http = { path = "./crates/http/", version = "=1.14.0" } mas-http = { path = "./crates/http/", version = "=1.15.0-rc.0" }
mas-i18n = { path = "./crates/i18n/", version = "=1.14.0" } mas-i18n = { path = "./crates/i18n/", version = "=1.15.0-rc.0" }
mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.14.0" } mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.15.0-rc.0" }
mas-iana = { path = "./crates/iana/", version = "=1.14.0" } mas-iana = { path = "./crates/iana/", version = "=1.15.0-rc.0" }
mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.14.0" } mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.15.0-rc.0" }
mas-jose = { path = "./crates/jose/", version = "=1.14.0" } mas-jose = { path = "./crates/jose/", version = "=1.15.0-rc.0" }
mas-keystore = { path = "./crates/keystore/", version = "=1.14.0" } mas-keystore = { path = "./crates/keystore/", version = "=1.15.0-rc.0" }
mas-listener = { path = "./crates/listener/", version = "=1.14.0" } mas-listener = { path = "./crates/listener/", version = "=1.15.0-rc.0" }
mas-matrix = { path = "./crates/matrix/", version = "=1.14.0" } mas-matrix = { path = "./crates/matrix/", version = "=1.15.0-rc.0" }
mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.14.0" } mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.15.0-rc.0" }
mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.14.0" } mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.15.0-rc.0" }
mas-policy = { path = "./crates/policy/", version = "=1.14.0" } mas-policy = { path = "./crates/policy/", version = "=1.15.0-rc.0" }
mas-router = { path = "./crates/router/", version = "=1.14.0" } mas-router = { path = "./crates/router/", version = "=1.15.0-rc.0" }
mas-spa = { path = "./crates/spa/", version = "=1.14.0" } mas-spa = { path = "./crates/spa/", version = "=1.15.0-rc.0" }
mas-storage = { path = "./crates/storage/", version = "=1.14.0" } mas-storage = { path = "./crates/storage/", version = "=1.15.0-rc.0" }
mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.14.0" } mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.15.0-rc.0" }
mas-tasks = { path = "./crates/tasks/", version = "=1.14.0" } mas-tasks = { path = "./crates/tasks/", version = "=1.15.0-rc.0" }
mas-templates = { path = "./crates/templates/", version = "=1.14.0" } mas-templates = { path = "./crates/templates/", version = "=1.15.0-rc.0" }
mas-tower = { path = "./crates/tower/", version = "=1.14.0" } mas-tower = { path = "./crates/tower/", version = "=1.15.0-rc.0" }
oauth2-types = { path = "./crates/oauth2-types/", version = "=1.14.0" } oauth2-types = { path = "./crates/oauth2-types/", version = "=1.15.0-rc.0" }
syn2mas = { path = "./crates/syn2mas", version = "=1.14.0" } syn2mas = { path = "./crates/syn2mas", version = "=1.15.0-rc.0" }
# OpenAPI schema generation and validation # OpenAPI schema generation and validation
[workspace.dependencies.aide] [workspace.dependencies.aide]