diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eae60a90..ea96040a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -190,7 +190,7 @@ jobs: with: tool: cargo-semver-checks - name: Check Semver Compliance - run: LOCKSTEP_XML_PATH="../xml" cargo semver-checks check-release -p atspi --default-features + run: cargo semver-checks check-release -p atspi --default-features msrv-compliance: runs-on: ubuntu-latest needs: [clippy,no-unused-dependencies,find-msrv] diff --git a/atspi-common/Cargo.toml b/atspi-common/Cargo.toml index 23c4003e..de47cd0e 100644 --- a/atspi-common/Cargo.toml +++ b/atspi-common/Cargo.toml @@ -7,8 +7,8 @@ categories = ["accessibility", "api-bindings"] keywords = ["Macros", "Accessibility"] repository = "https://github.com/odilia-app/atspi" description = "Primitive types used for sending and receiving Linux accessibility events." -license = "Apache-2.0 OR MIT" -include = ["src/**/*", "LICENSE-*", "README.md"] +license = "Apache-2.0 OR MIT" +include = ["src/**/*", "LICENSE-*", "README.md", "xml/*"] rust-version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -22,19 +22,19 @@ tokio = ["zbus/tokio"] enumflags2 = "0.7.7" serde = "1.0" static_assertions = "1.1.0" +zbus-lockstep = "0.4.4" +zbus-lockstep-macros = "0.4.4" zbus_names = "3.0" zvariant = { version = "4.0", default-features = false } zbus = { workspace = true, optional = true, default-features = false } -zbus-lockstep = "0.4.2" -zbus-lockstep-macros = "0.4.2" [dev-dependencies] -zbus = { workspace = true } atspi-connection = { path = "../atspi-connection" } atspi-proxies = { path = "../atspi-proxies" } -tokio-stream = { version = "0.1", default-features = false, features = ["time"] } -tokio = { version = "1", default_features = false, features = ["macros", "rt-multi-thread"] } rename-item = "0.1.0" -tokio-test = "0.4.2" serde_plain = "1.0.1" static_assertions = "1.1.0" +tokio-stream = { version = "0.1", default-features = false, features = ["time"] } +tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread"] } +tokio-test = "0.4.2" +zbus = { workspace = true } diff --git a/atspi-common/src/lib.rs b/atspi-common/src/lib.rs index 719c7ab9..69619795 100644 --- a/atspi-common/src/lib.rs +++ b/atspi-common/src/lib.rs @@ -248,12 +248,6 @@ mod tests { assert!(Live::try_from(-1).is_err()); } - #[test] - fn set_env_for_signature_validations() { - std::env::set_var("LOCKSTEP_XML_PATH", "../xml"); - assert_eq!(std::env::var("LOCKSTEP_XML_PATH").unwrap(), "../xml"); - } - #[test] fn validate_live_signature() { let signature = signal_body_type_signature!("Announcement"); diff --git a/atspi-common/tests/tests.rs b/atspi-common/tests/tests.rs index d030d2cc..0e059c3d 100644 --- a/atspi-common/tests/tests.rs +++ b/atspi-common/tests/tests.rs @@ -9,8 +9,6 @@ use zvariant::OwnedObjectPath; #[tokio::test] async fn test_recv_remove_accessible() { - std::env::set_var("LOCKSTEP_XML_PATH", "../xml"); - let atspi = atspi_connection::AccessibilityConnection::new().await.unwrap(); atspi.register_event::().await.unwrap(); let unique_bus_name = atspi.connection().unique_name().unwrap(); @@ -70,9 +68,6 @@ async fn test_recv_remove_accessible() { #[tokio::test] async fn test_recv_add_accessible() { - // Set env variable `LOCKSTEP_XML_PATH` to the path of the XML files. See above. - std::env::set_var("LOCKSTEP_XML_PATH", "../xml"); - let atspi = AccessibilityConnection::new().await.unwrap(); atspi.register_event::().await.unwrap(); let unique_bus_name = atspi.connection().unique_name().unwrap(); @@ -133,8 +128,6 @@ async fn test_recv_add_accessible() { // that we can handle that case. #[tokio::test] async fn test_recv_add_accessible_unmarshalled_body() { - std::env::set_var("LOCKSTEP_XML_PATH", "../xml"); - let atspi = AccessibilityConnection::new().await.unwrap(); atspi.register_event::().await.unwrap(); let unique_bus_name = atspi.connection().unique_name().unwrap(); diff --git a/xml/Accessible.xml b/atspi-common/xml/Accessible.xml similarity index 100% rename from xml/Accessible.xml rename to atspi-common/xml/Accessible.xml diff --git a/xml/Action.xml b/atspi-common/xml/Action.xml similarity index 100% rename from xml/Action.xml rename to atspi-common/xml/Action.xml diff --git a/xml/Application.xml b/atspi-common/xml/Application.xml similarity index 100% rename from xml/Application.xml rename to atspi-common/xml/Application.xml diff --git a/xml/Cache.xml b/atspi-common/xml/Cache.xml similarity index 100% rename from xml/Cache.xml rename to atspi-common/xml/Cache.xml diff --git a/xml/Collection.xml b/atspi-common/xml/Collection.xml similarity index 100% rename from xml/Collection.xml rename to atspi-common/xml/Collection.xml diff --git a/xml/Component.xml b/atspi-common/xml/Component.xml similarity index 100% rename from xml/Component.xml rename to atspi-common/xml/Component.xml diff --git a/xml/DeviceEventController.xml b/atspi-common/xml/DeviceEventController.xml similarity index 100% rename from xml/DeviceEventController.xml rename to atspi-common/xml/DeviceEventController.xml diff --git a/xml/DeviceEventListener.xml b/atspi-common/xml/DeviceEventListener.xml similarity index 100% rename from xml/DeviceEventListener.xml rename to atspi-common/xml/DeviceEventListener.xml diff --git a/xml/Document.xml b/atspi-common/xml/Document.xml similarity index 100% rename from xml/Document.xml rename to atspi-common/xml/Document.xml diff --git a/xml/EditableText.xml b/atspi-common/xml/EditableText.xml similarity index 100% rename from xml/EditableText.xml rename to atspi-common/xml/EditableText.xml diff --git a/xml/Event.xml b/atspi-common/xml/Event.xml similarity index 100% rename from xml/Event.xml rename to atspi-common/xml/Event.xml diff --git a/xml/Hyperlink.xml b/atspi-common/xml/Hyperlink.xml similarity index 100% rename from xml/Hyperlink.xml rename to atspi-common/xml/Hyperlink.xml diff --git a/xml/Hypertext.xml b/atspi-common/xml/Hypertext.xml similarity index 100% rename from xml/Hypertext.xml rename to atspi-common/xml/Hypertext.xml diff --git a/xml/Image.xml b/atspi-common/xml/Image.xml similarity index 100% rename from xml/Image.xml rename to atspi-common/xml/Image.xml diff --git a/xml/Registry.xml b/atspi-common/xml/Registry.xml similarity index 100% rename from xml/Registry.xml rename to atspi-common/xml/Registry.xml diff --git a/xml/Selection.xml b/atspi-common/xml/Selection.xml similarity index 100% rename from xml/Selection.xml rename to atspi-common/xml/Selection.xml diff --git a/xml/Socket.xml b/atspi-common/xml/Socket.xml similarity index 100% rename from xml/Socket.xml rename to atspi-common/xml/Socket.xml diff --git a/xml/Table.xml b/atspi-common/xml/Table.xml similarity index 100% rename from xml/Table.xml rename to atspi-common/xml/Table.xml diff --git a/xml/TableCell.xml b/atspi-common/xml/TableCell.xml similarity index 100% rename from xml/TableCell.xml rename to atspi-common/xml/TableCell.xml diff --git a/xml/Text.xml b/atspi-common/xml/Text.xml similarity index 100% rename from xml/Text.xml rename to atspi-common/xml/Text.xml diff --git a/xml/Value.xml b/atspi-common/xml/Value.xml similarity index 100% rename from xml/Value.xml rename to atspi-common/xml/Value.xml diff --git a/xml/generate-introspection.py b/atspi-common/xml/generate-introspection.py similarity index 100% rename from xml/generate-introspection.py rename to atspi-common/xml/generate-introspection.py diff --git a/xml/schemas/DBus.xsd b/atspi-common/xml/schemas/DBus.xsd similarity index 100% rename from xml/schemas/DBus.xsd rename to atspi-common/xml/schemas/DBus.xsd diff --git a/xml/schemas/Types.xml b/atspi-common/xml/schemas/Types.xml similarity index 100% rename from xml/schemas/Types.xml rename to atspi-common/xml/schemas/Types.xml diff --git a/xml/schemas/XMLSchema.xsd b/atspi-common/xml/schemas/XMLSchema.xsd similarity index 100% rename from xml/schemas/XMLSchema.xsd rename to atspi-common/xml/schemas/XMLSchema.xsd