From 5c0316cbbd70d478cc73cb5df4e71e7ba1b7a320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Moreno?= Date: Fri, 8 Jun 2018 15:51:37 +0200 Subject: [PATCH] fractal-api renamed to fractal-matrix-api --- Cargo.lock | 50 +++++++++---------- Cargo.toml | 2 +- fractal-gtk/Cargo.toml | 4 +- fractal-gtk/src/main.rs | 3 +- .../Cargo.toml | 6 +-- .../src/backend/directory.rs | 0 .../src/backend/media.rs | 0 .../src/backend/mod.rs | 0 .../src/backend/register.rs | 0 .../src/backend/room.rs | 0 .../src/backend/stickers.rs | 0 .../src/backend/sync.rs | 0 .../src/backend/types.rs | 0 .../src/backend/user.rs | 0 .../src/cache.rs | 0 .../src/error.rs | 0 .../src/globals.rs | 0 .../src/lib.rs | 0 .../src/model/event.rs | 0 .../src/model/member.rs | 0 .../src/model/message.rs | 0 .../src/model/mod.rs | 0 .../src/model/protocol.rs | 0 .../src/model/room.rs | 0 .../src/model/stickers.rs | 0 .../src/model/userinfo.rs | 0 .../src/types.rs | 0 .../src/util.rs | 0 scripts/grabber.sh | 2 +- scripts/release.sh | 2 +- 30 files changed, 35 insertions(+), 34 deletions(-) rename {fractal-api => fractal-matrix-api}/Cargo.toml (90%) rename {fractal-api => fractal-matrix-api}/src/backend/directory.rs (100%) rename {fractal-api => fractal-matrix-api}/src/backend/media.rs (100%) rename {fractal-api => fractal-matrix-api}/src/backend/mod.rs (100%) rename {fractal-api => fractal-matrix-api}/src/backend/register.rs (100%) rename {fractal-api => fractal-matrix-api}/src/backend/room.rs (100%) rename {fractal-api => fractal-matrix-api}/src/backend/stickers.rs (100%) rename {fractal-api => fractal-matrix-api}/src/backend/sync.rs (100%) rename {fractal-api => fractal-matrix-api}/src/backend/types.rs (100%) rename {fractal-api => fractal-matrix-api}/src/backend/user.rs (100%) rename {fractal-api => fractal-matrix-api}/src/cache.rs (100%) rename {fractal-api => fractal-matrix-api}/src/error.rs (100%) rename {fractal-api => fractal-matrix-api}/src/globals.rs (100%) rename {fractal-api => fractal-matrix-api}/src/lib.rs (100%) rename {fractal-api => fractal-matrix-api}/src/model/event.rs (100%) rename {fractal-api => fractal-matrix-api}/src/model/member.rs (100%) rename {fractal-api => fractal-matrix-api}/src/model/message.rs (100%) rename {fractal-api => fractal-matrix-api}/src/model/mod.rs (100%) rename {fractal-api => fractal-matrix-api}/src/model/protocol.rs (100%) rename {fractal-api => fractal-matrix-api}/src/model/room.rs (100%) rename {fractal-api => fractal-matrix-api}/src/model/stickers.rs (100%) rename {fractal-api => fractal-matrix-api}/src/model/userinfo.rs (100%) rename {fractal-api => fractal-matrix-api}/src/types.rs (100%) rename {fractal-api => fractal-matrix-api}/src/util.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index cdaefa08..042bf99d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -361,60 +361,60 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "fractal-api" +name = "fractal-gtk" version = "3.29.0" dependencies = [ "cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "comrak 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fractal-matrix-api 3.29.0", "gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gettext-rs 0.3.0 (git+https://github.com/danigm/gettext-rs?branch=no-gettext)", + "gio 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "md5 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "gspell 0.1.0 (git+https://gitlab.gnome.org/jsparber/gspell-rs)", + "gtk 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "html2pango 0.1.0 (git+https://gitlab.gnome.org/World/html2pango)", + "html5ever 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "notify-rust 3.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "pango 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pangocairo 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "secret-service 0.4.0 (git+https://github.com/jhaye/secret-service-rs?rev=3c265527e43376fe8e00ddfa645a70813c35f449)", "serde 1.0.43 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.43 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "tree_magic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "urlencoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "fractal-gtk" +name = "fractal-matrix-api" version = "3.29.0" dependencies = [ "cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "comrak 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fractal-api 3.29.0", "gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gettext-rs 0.3.0 (git+https://github.com/danigm/gettext-rs?branch=no-gettext)", - "gio 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gspell 0.1.0 (git+https://gitlab.gnome.org/jsparber/gspell-rs)", - "gtk 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "html2pango 0.1.0 (git+https://gitlab.gnome.org/World/html2pango)", - "html5ever 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", - "notify-rust 3.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "md5 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "pango 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "secret-service 0.4.0 (git+https://github.com/jhaye/secret-service-rs?rev=3c265527e43376fe8e00ddfa645a70813c35f449)", + "pangocairo 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.43 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.43 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", "tree_magic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "urlencoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index eac6d25e..5df074d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "fractal-api", + "fractal-matrix-api", "fractal-gtk", ] diff --git a/fractal-gtk/Cargo.toml b/fractal-gtk/Cargo.toml index a604005e..fd680469 100644 --- a/fractal-gtk/Cargo.toml +++ b/fractal-gtk/Cargo.toml @@ -38,8 +38,8 @@ version = "0.4.1" features = ["serde"] version = "0.4.2" -[dependencies.fractal-api] -path = "../fractal-api" +[dependencies.fractal-matrix-api] +path = "../fractal-matrix-api" [dependencies.gspell] git = "https://gitlab.gnome.org/jsparber/gspell-rs" diff --git a/fractal-gtk/src/main.rs b/fractal-gtk/src/main.rs index 85aa8092..a0f81585 100644 --- a/fractal-gtk/src/main.rs +++ b/fractal-gtk/src/main.rs @@ -9,12 +9,13 @@ extern crate failure; extern crate serde_derive; #[macro_use] -extern crate fractal_api; +extern crate fractal_matrix_api as fractal_api; extern crate html2pango; extern crate gspell; + use fractal_api::backend; use fractal_api::types; use fractal_api::error; diff --git a/fractal-api/Cargo.toml b/fractal-matrix-api/Cargo.toml similarity index 90% rename from fractal-api/Cargo.toml rename to fractal-matrix-api/Cargo.toml index 64d411e2..c195eef2 100644 --- a/fractal-api/Cargo.toml +++ b/fractal-matrix-api/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Daniel Garcia "] -name = "fractal-api" +name = "fractal-matrix-api" version = "3.29.0" workspace = "../" @@ -8,11 +8,11 @@ description = """ Library to communicate with a Matrix.org server """ keywords = [ - "matrix", + "matrix", "fractal" ] license = "GPL-3.0" repository = "https://https://gitlab.gnome.org/World/fractal" -documentation = "https://world.pages.gitlab.gnome.org/fractal/fractal_api/index.html" +documentation = "https://world.pages.gitlab.gnome.org/fractal/fractal_matrix_api/index.html" [dependencies] gdk = "0.8.0" diff --git a/fractal-api/src/backend/directory.rs b/fractal-matrix-api/src/backend/directory.rs similarity index 100% rename from fractal-api/src/backend/directory.rs rename to fractal-matrix-api/src/backend/directory.rs diff --git a/fractal-api/src/backend/media.rs b/fractal-matrix-api/src/backend/media.rs similarity index 100% rename from fractal-api/src/backend/media.rs rename to fractal-matrix-api/src/backend/media.rs diff --git a/fractal-api/src/backend/mod.rs b/fractal-matrix-api/src/backend/mod.rs similarity index 100% rename from fractal-api/src/backend/mod.rs rename to fractal-matrix-api/src/backend/mod.rs diff --git a/fractal-api/src/backend/register.rs b/fractal-matrix-api/src/backend/register.rs similarity index 100% rename from fractal-api/src/backend/register.rs rename to fractal-matrix-api/src/backend/register.rs diff --git a/fractal-api/src/backend/room.rs b/fractal-matrix-api/src/backend/room.rs similarity index 100% rename from fractal-api/src/backend/room.rs rename to fractal-matrix-api/src/backend/room.rs diff --git a/fractal-api/src/backend/stickers.rs b/fractal-matrix-api/src/backend/stickers.rs similarity index 100% rename from fractal-api/src/backend/stickers.rs rename to fractal-matrix-api/src/backend/stickers.rs diff --git a/fractal-api/src/backend/sync.rs b/fractal-matrix-api/src/backend/sync.rs similarity index 100% rename from fractal-api/src/backend/sync.rs rename to fractal-matrix-api/src/backend/sync.rs diff --git a/fractal-api/src/backend/types.rs b/fractal-matrix-api/src/backend/types.rs similarity index 100% rename from fractal-api/src/backend/types.rs rename to fractal-matrix-api/src/backend/types.rs diff --git a/fractal-api/src/backend/user.rs b/fractal-matrix-api/src/backend/user.rs similarity index 100% rename from fractal-api/src/backend/user.rs rename to fractal-matrix-api/src/backend/user.rs diff --git a/fractal-api/src/cache.rs b/fractal-matrix-api/src/cache.rs similarity index 100% rename from fractal-api/src/cache.rs rename to fractal-matrix-api/src/cache.rs diff --git a/fractal-api/src/error.rs b/fractal-matrix-api/src/error.rs similarity index 100% rename from fractal-api/src/error.rs rename to fractal-matrix-api/src/error.rs diff --git a/fractal-api/src/globals.rs b/fractal-matrix-api/src/globals.rs similarity index 100% rename from fractal-api/src/globals.rs rename to fractal-matrix-api/src/globals.rs diff --git a/fractal-api/src/lib.rs b/fractal-matrix-api/src/lib.rs similarity index 100% rename from fractal-api/src/lib.rs rename to fractal-matrix-api/src/lib.rs diff --git a/fractal-api/src/model/event.rs b/fractal-matrix-api/src/model/event.rs similarity index 100% rename from fractal-api/src/model/event.rs rename to fractal-matrix-api/src/model/event.rs diff --git a/fractal-api/src/model/member.rs b/fractal-matrix-api/src/model/member.rs similarity index 100% rename from fractal-api/src/model/member.rs rename to fractal-matrix-api/src/model/member.rs diff --git a/fractal-api/src/model/message.rs b/fractal-matrix-api/src/model/message.rs similarity index 100% rename from fractal-api/src/model/message.rs rename to fractal-matrix-api/src/model/message.rs diff --git a/fractal-api/src/model/mod.rs b/fractal-matrix-api/src/model/mod.rs similarity index 100% rename from fractal-api/src/model/mod.rs rename to fractal-matrix-api/src/model/mod.rs diff --git a/fractal-api/src/model/protocol.rs b/fractal-matrix-api/src/model/protocol.rs similarity index 100% rename from fractal-api/src/model/protocol.rs rename to fractal-matrix-api/src/model/protocol.rs diff --git a/fractal-api/src/model/room.rs b/fractal-matrix-api/src/model/room.rs similarity index 100% rename from fractal-api/src/model/room.rs rename to fractal-matrix-api/src/model/room.rs diff --git a/fractal-api/src/model/stickers.rs b/fractal-matrix-api/src/model/stickers.rs similarity index 100% rename from fractal-api/src/model/stickers.rs rename to fractal-matrix-api/src/model/stickers.rs diff --git a/fractal-api/src/model/userinfo.rs b/fractal-matrix-api/src/model/userinfo.rs similarity index 100% rename from fractal-api/src/model/userinfo.rs rename to fractal-matrix-api/src/model/userinfo.rs diff --git a/fractal-api/src/types.rs b/fractal-matrix-api/src/types.rs similarity index 100% rename from fractal-api/src/types.rs rename to fractal-matrix-api/src/types.rs diff --git a/fractal-api/src/util.rs b/fractal-matrix-api/src/util.rs similarity index 100% rename from fractal-api/src/util.rs rename to fractal-matrix-api/src/util.rs diff --git a/scripts/grabber.sh b/scripts/grabber.sh index 6bcc1770..df5d5235 100755 --- a/scripts/grabber.sh +++ b/scripts/grabber.sh @@ -1,5 +1,5 @@ #!/bin/sh -find fractal-api -name *.rs +find fractal-matrix-api -name *.rs find fractal-gtk -name *.rs find fractal-gtk/res diff --git a/scripts/release.sh b/scripts/release.sh index 5eb08977..206fcc58 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -10,7 +10,7 @@ mkdir -p $DIST # copying files cp -rf fractal-gtk $DIST -cp -rf fractal-api $DIST +cp -rf fractal-matrix-api $DIST cp Cargo.toml $DIST cp Cargo.lock $DIST cp meson.build $DIST