diff --git a/Cargo.lock b/Cargo.lock index 9ff639f..ed9c67e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -282,7 +282,7 @@ dependencies = [ [[package]] name = "assets" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "gpui", @@ -544,7 +544,7 @@ dependencies = [ [[package]] name = "auto_update" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "gpui", "gpui-updater", @@ -1065,7 +1065,7 @@ dependencies = [ [[package]] name = "chat" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "common", @@ -1087,7 +1087,7 @@ dependencies = [ [[package]] name = "chat_ui" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "chat", @@ -1271,7 +1271,7 @@ dependencies = [ [[package]] name = "common" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "chrono", "dirs 5.0.1", @@ -1399,7 +1399,7 @@ dependencies = [ [[package]] name = "coop" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "assets", "auto_update", @@ -1425,7 +1425,7 @@ dependencies = [ [[package]] name = "coop_web" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "assets", "chat", @@ -1769,7 +1769,7 @@ dependencies = [ [[package]] name = "device" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "common", @@ -5000,7 +5000,7 @@ dependencies = [ [[package]] name = "person" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "common", @@ -6466,7 +6466,7 @@ dependencies = [ [[package]] name = "settings" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "common", @@ -6744,7 +6744,7 @@ dependencies = [ [[package]] name = "state" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "browser-signer-proxy", @@ -7095,7 +7095,7 @@ dependencies = [ [[package]] name = "theme" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "gpui", @@ -7644,7 +7644,7 @@ dependencies = [ [[package]] name = "ui" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "common", @@ -9114,7 +9114,7 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "workspace" -version = "1.0.0-beta5" +version = "1.0.0" dependencies = [ "anyhow", "auto_update", diff --git a/Cargo.toml b/Cargo.toml index 6d6016a..32c9b9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["crates/*", "desktop", "web"] default-members = ["desktop"] [workspace.package] -version = "1.0.0-beta5" +version = "1.0.0" edition = "2024" publish = false diff --git a/Cargo.toml-E b/Cargo.toml-E deleted file mode 100644 index 6d6016a..0000000 --- a/Cargo.toml-E +++ /dev/null @@ -1,62 +0,0 @@ -[workspace] -resolver = "2" -members = ["crates/*", "desktop", "web"] -default-members = ["desktop"] - -[workspace.package] -version = "1.0.0-beta5" -edition = "2024" -publish = false - -[workspace.dependencies] -# GPUI -gpui = { git = "https://github.com/zed-industries/zed" } -gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["font-kit", "x11", "wayland"] } -gpui_linux = { git = "https://github.com/zed-industries/zed" } -gpui_windows = { git = "https://github.com/zed-industries/zed" } -gpui_macos = { git = "https://github.com/zed-industries/zed" } -gpui_tokio = { git = "https://github.com/zed-industries/zed" } -reqwest_client = { git = "https://github.com/zed-industries/zed" } - -# Nostr -nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" } -nostr-memory = { git = "https://github.com/rust-nostr/nostr" } -nostr-blossom = { git = "https://github.com/rust-nostr/nostr" } -nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" } -nostr-connect = { git = "https://github.com/rust-nostr/nostr" } -nostr-sdk = { git = "https://github.com/rust-nostr/nostr" } -nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44" ] } - -# Others -anyhow = "1.0.44" -chrono = { version = "0.4.38", features = ["wasmbind"] } -futures = "0.3" -itertools = "0.13.0" -log = "0.4" -oneshot = "0.1.10" -flume = { version = "0.11.1", default-features = false, features = ["async", "select"] } -rust-embed = { version = "8.5", features = ["include-exclude"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -schemars = "1" -smallvec = "1.14.0" -smol = "2" -webbrowser = "1.0.4" -tracing-subscriber = { version = "0.3.18", features = ["fmt"] } -errno = { version = "0.3.14", default-features = false } -instant = "0.1" - -[patch.crates-io] -# Use stacker's psm version which may have better WASM support -psm = { git = "https://github.com/rust-lang/stacker", branch = "master" } - -[profile.release] -strip = true -opt-level = "z" -lto = true -codegen-units = 1 -panic = "abort" - -[profile.profiling] -inherits = "release" -debug = true diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index a1ff45a..ac3cff6 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -14,7 +14,7 @@ product-name = "Coop" description = "Chat Freely, Stay Private on Nostr" identifier = "su.reya.coop" category = "SocialNetworking" -version = "1.0.0-beta5" +version = "1.0.0" out-dir = "../dist" before-packaging-command = "cargo build --release" resources = ["Cargo.toml", "src"] diff --git a/desktop/Cargo.toml-E b/desktop/Cargo.toml-E deleted file mode 100644 index a1ff45a..0000000 --- a/desktop/Cargo.toml-E +++ /dev/null @@ -1,51 +0,0 @@ -[package] -name = "coop" -version.workspace = true -edition.workspace = true -publish.workspace = true - -[[bin]] -name = "coop" -path = "src/main.rs" - -[package.metadata.packager] -name = "Coop" -product-name = "Coop" -description = "Chat Freely, Stay Private on Nostr" -identifier = "su.reya.coop" -category = "SocialNetworking" -version = "1.0.0-beta5" -out-dir = "../dist" -before-packaging-command = "cargo build --release" -resources = ["Cargo.toml", "src"] -icons = [ - "resources/32x32.png", - "resources/128x128.png", - "resources/128x128@2x.png", - "resources/icon.icns", - "resources/icon.ico", -] - -[dependencies] -assets = { path = "../crates/assets" } -workspace = { path = "../crates/workspace" } -ui = { path = "../crates/ui" } -theme = { path = "../crates/theme" } -common = { path = "../crates/common" } -state = { path = "../crates/state" } -device = { path = "../crates/device" } -chat = { path = "../crates/chat" } -settings = { path = "../crates/settings" } -auto_update = { path = "../crates/auto_update" } -person = { path = "../crates/person" } - -gpui.workspace = true -gpui_platform.workspace = true -gpui_linux.workspace = true -gpui_windows.workspace = true -gpui_macos.workspace = true -reqwest_client.workspace = true - -log.workspace = true -tracing-subscriber.workspace = true -nostr-sdk.workspace = true diff --git a/flathub/README.md b/flathub/README.md index 969a6dd..e48f56d 100644 --- a/flathub/README.md +++ b/flathub/README.md @@ -55,8 +55,8 @@ flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo Ensure you have: - [ ] Committed all changes -- [ ] Tagged the release: `git tag -a v1.0.0-beta2 -m "Release v1.0.0-beta2"` -- [ ] Pushed the tag: `git push origin v1.0.0-beta2` +- [ ] Tagged the release: `git tag -a v1.0.0 -m "Release v1.0.0"` +- [ ] Pushed the tag: `git push origin v1.0.0` - [ ] Run `./script/prepare-flathub.sh` to regenerate files ### 2. Fork and Submit @@ -101,8 +101,8 @@ git push origin su.reya.coop To release a new version: 1. Update version in workspace `Cargo.toml` -2. Tag the new release: `git tag -a v1.0.0-beta3 -m "Release v1.0.0-beta3"` -3. Push the tag: `git push origin v1.0.0-beta3` +2. Tag the new release: `git tag -a v1.0.0 -m "Release v1.0.0"` +3. Push the tag: `git push origin v1.0.0` 4. Run `./script/prepare-flathub.sh` to regenerate 5. Clone the flathub repo: `git clone https://github.com/flathub/su.reya.coop.git` 6. Update the manifest with new commit/tag and hashes