Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rust-pr-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

env:
CARGO_TERM_COLOR: always
LXMF_REF: d61ed1171d07720e5cfba3d3b0a9c83496732221
LXMF_REF: 51fd3beebdace78d6c7f38748c6bcfe452032559

jobs:
msrv-docs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
release_version:
description: "Version label to embed in manually built artifacts"
required: false
default: "v3.0.0-preview.9"
default: "v3.0.0-preview.10"
release:
types: [published]
push:
Expand All @@ -29,7 +29,7 @@ permissions:
contents: write

env:
LXMF_REF: d61ed1171d07720e5cfba3d3b0a9c83496732221
LXMF_REF: 51fd3beebdace78d6c7f38748c6bcfe452032559

jobs:
server-package:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
contents: read

env:
LXMF_REF: d61ed1171d07720e5cfba3d3b0a9c83496732221
LXMF_REF: 51fd3beebdace78d6c7f38748c6bcfe452032559

jobs:
rust:
Expand Down
145 changes: 131 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ r3akt-rch-server = { path = "crates/r3akt-rch-server" }
r3akt-tak-connector = { path = "crates/r3akt-tak-connector" }
r3akt-transport-rns = { path = "crates/r3akt-transport-rns" }
rand_core = { version = "0.6.4", features = ["getrandom"] }
rns-core = { package = "reticulum-rs-core", path = "../LXMF-rs/crates/libs/rns-core", version = "0.9.6" }
rns-core = { package = "reticulum-rs-core", path = "../LXMF-rs/crates/libs/rns-core", version = "0.9.9" }
base64 = "0.22"
argon2 = "0.5"
chrono = { version = "0.4.42", default-features = false, features = ["clock", "serde", "std"] }
Expand Down
2 changes: 1 addition & 1 deletion apps/rch-desktop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ npm --prefix apps/rch-desktop install
npm --prefix apps/rch-desktop run build
```

The sidecar preparation step builds LXMF `0.9.5` `reticulumd`,
The sidecar preparation step builds LXMF `0.9.9` `reticulumd`,
`r3akt-rch-server`, and `r3akt-tak-service`, then copies them into `src-tauri/binaries/` with the
host target-triple suffix required by Tauri.

Expand Down
4 changes: 2 additions & 2 deletions apps/rch-desktop/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/rch-desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "rch-desktop-tauri",
"private": true,
"version": "3.0.0-preview.9",
"version": "3.0.0-preview.10",
"type": "module",
"scripts": {
"build": "npm --prefix ../../ui run build && npm run prepare:sidecar && cargo build --release --locked --manifest-path src-tauri/Cargo.toml && tauri bundle --ci",
Expand Down
2 changes: 1 addition & 1 deletion apps/rch-desktop/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/rch-desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rch-desktop"
version = "3.0.0-preview.9"
version = "3.0.0-preview.10"
edition = "2024"
rust-version = "1.88"
license = "EPL-2.0"
Expand Down
2 changes: 1 addition & 1 deletion apps/rch-desktop/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "RCH Desktop",
"version": "3.0.0-preview.9",
"version": "3.0.0-preview.10",
"identifier": "org.freetakteam.rch",
"build": {
"frontendDist": "../../../ui/dist",
Expand Down
4 changes: 2 additions & 2 deletions config/lxmf-runtime-baseline.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"repository": "FreeTAKTeam/LXMF-rs",
"release_tag": "v0.9.5",
"sdk_version": "0.9.5",
"release_tag": "v0.9.9",
"sdk_version": "0.9.9",
"daemon_package": "reticulumd",
"daemon_features": ["zmq-pipeline-rpc"],
"contract_version": 2,
Expand Down
6 changes: 3 additions & 3 deletions crates/r3akt-transport-rns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ repository.workspace = true

[dependencies]
base64.workspace = true
lxmf = { package = "lxmf-wire", path = "../../../LXMF-rs/crates/libs/lxmf-core", version = "0.9.6", default-features = false, features = ["std"] }
lxmf-sdk = { path = "../../../LXMF-rs/crates/libs/lxmf-sdk", version = "0.9.6", default-features = false, features = ["zmq-pipeline-backend"] }
lxmf = { package = "lxmf-wire", path = "../../../LXMF-rs/crates/libs/lxmf-core", version = "0.9.9", default-features = false, features = ["std"] }
lxmf-sdk = { path = "../../../LXMF-rs/crates/libs/lxmf-sdk", version = "0.9.9", default-features = false, features = ["zmq-pipeline-backend"] }
r3akt-protocol.workspace = true
rns-rpc = { package = "reticulum-rs-rpc", path = "../../../LXMF-rs/crates/libs/rns-rpc", version = "0.9.6" }
rns-rpc = { package = "reticulum-rs-rpc", path = "../../../LXMF-rs/crates/libs/rns-rpc", version = "0.9.9" }
rmp-serde.workspace = true
serde.workspace = true
serde_json.workspace = true
Expand Down
Loading
Loading