Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove "tray" from default features and allow using "ayatana" instead #469

Merged
merged 1 commit into from
Jan 17, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ jobs:
${{ matrix.platform }}-stable-cargo-core-

- name: build wry
run: cargo build --target ${{ matrix.platform.target }}
run: cargo build --features tray --target ${{ matrix.platform.target }}

- name: build tests and examples
shell: bash
run: cargo test --no-run --verbose --target ${{ matrix.platform.target }}
run: cargo test --no-run --verbose --features tray --target ${{ matrix.platform.target }}

- name: run tests
if: (!contains(matrix.platform.target, 'ios'))
run: cargo test --verbose --target ${{ matrix.platform.target }}
run: cargo test --verbose --features tray --target ${{ matrix.platform.target }}
14 changes: 12 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ targets = [
]

[features]
default = [ "file-drop", "protocol", "tray" ]
default = [ "file-drop", "protocol" ]
file-drop = [ ]
protocol = [ ]
dox = [ "tao/dox" ]
tray = [ "tao/tray" ]
tray = [ "tao/tray", "system_tray" ]
ayatana = [ "tao/ayatana", "system_tray" ]
transparent = [ ]
fullscreen = [ ]
system_tray = [ ]

[dependencies]
libc = "0.2"
Expand Down Expand Up @@ -78,3 +80,11 @@ cocoa = "0.24"
core-graphics = "0.22"
objc = "0.2"
objc_id = "0.1"

[[example]]
name = "system_tray_no_menu"
required-features = ["system_tray"]

[[example]]
name = "system_tray"
required-features = ["system_tray"]