diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 1068d8a2..39f0f339 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -65,3 +65,9 @@ jobs: - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - run: cargo test --workspace --lib --bins --tests --benches --all-features --no-fail-fast + + deny: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: EmbarkStudios/cargo-deny-action@v1 \ No newline at end of file diff --git a/.gitignore b/.gitignore index c41cc9e3..2a0038a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/target \ No newline at end of file +/target +.idea \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 0503b9c8..cd80f140 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -283,7 +283,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener 2.5.3", + "event-listener", "futures-core", ] @@ -294,7 +294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener", "futures-core", ] @@ -350,23 +350,24 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener 2.5.3", + "event-listener", ] [[package]] name = "async-process" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf012553ce51eb7aa6dc2143804cc8252bd1cb681a1c5cb7fa94ca88682dee1d" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ "async-io", "async-lock", - "async-signal", + "autocfg", "blocking", "cfg-if", - "event-listener 3.0.0", + "event-listener", "futures-lite", - "rustix 0.38.15", + "rustix 0.37.24", + "signal-hook", "windows-sys 0.48.0", ] @@ -381,25 +382,6 @@ dependencies = [ "syn 2.0.37", ] -[[package]] -name = "async-signal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c99f3cb3f9ff89f7d718fbb942c9eb91bedff12e396adf09a622dfe7ffec2bc2" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "concurrent-queue", - "futures-core", - "futures-io", - "libc", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - [[package]] name = "async-task" version = "4.4.1" @@ -458,9 +440,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atomic_refcell" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" +checksum = "76f2bfe491d41d45507b8431da8274f7feeca64a49e86d980eed2937ec2ff020" [[package]] name = "atspi" @@ -627,9 +609,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -638,9 +620,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -790,7 +772,7 @@ dependencies = [ "tempfile", "thiserror", "time", - "toml 0.8.1", + "toml 0.8.2", "tracing", "tracing-subscriber", "ureq", @@ -1737,7 +1719,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.0", + "libloading 0.8.1", ] [[package]] @@ -2024,9 +2006,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" dependencies = [ "errno-dragonfly", "libc", @@ -2069,17 +2051,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "exr" version = "1.71.0" @@ -3000,9 +2971,9 @@ dependencies = [ [[package]] name = "i-slint-backend-linuxkms" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8a0837504439a5d77b1789936a107c6ddf6ac8375a68ed183343bbc711f57a" +checksum = "0e321d0f8d12509ec2ed5b5aba4996922606686ac3d86d70ba126cba1b4e4563" dependencies = [ "calloop 0.11.0", "drm", @@ -3020,9 +2991,9 @@ dependencies = [ [[package]] name = "i-slint-backend-qt" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c8025e1537c646b70c6cd022ff173e974ecd100060324e9c329c8dad9e99e6" +checksum = "0f1ce3687c329341842f79c31c95d7bcf49b6fda7fd19b09e0b5d7fb33b9d6b2" dependencies = [ "const-field-offset", "cpp", @@ -3040,9 +3011,9 @@ dependencies = [ [[package]] name = "i-slint-backend-selector" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721c573b9d3de9ccc3d18aec5b3ab9d7d659b2eaa716e347cf6f74a8e31ed6e6" +checksum = "e7382cc01e9c9ef607debe1e4af7e1c6af78720a258fd18d8e32761b8593c5db" dependencies = [ "cfg-if", "i-slint-backend-linuxkms", @@ -3053,9 +3024,9 @@ dependencies = [ [[package]] name = "i-slint-backend-winit" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f85b6de3d81990504d94bc0063772396a3bbe0ffc039869f47a1651ca09e5e" +checksum = "f8c0f3f01e2c678d24b81914a38e53d3b660a0ef13831acb59c71bd7c95ed0cb" dependencies = [ "accesskit", "accesskit_winit", @@ -3092,21 +3063,21 @@ dependencies = [ [[package]] name = "i-slint-common" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac264a2130496885524cbaa12fa23b668e42601c437e1548aed3e9e10eb1acf5" +checksum = "e7daf484e68bf27e06b7501767c6e66063c0f85948e57a6de679b53d2d9d2044" dependencies = [ "cfg-if", "derive_more", "fontdb", - "libloading 0.8.0", + "libloading 0.8.1", ] [[package]] name = "i-slint-compiler" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb33660ac8aca93a33f92c7b759d75093a9e33f845201b838bcaa7bcaf03403" +checksum = "8b99172cc43ca17a78e96e3f8f13699d9fc1c00474d2d87bc57c0f7e816c4a48" dependencies = [ "by_address", "codemap", @@ -3135,9 +3106,9 @@ dependencies = [ [[package]] name = "i-slint-core" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00886b3442a62595217021a49dd6d29b0a5a68637fe2b0794a2c6c57bff989f5" +checksum = "b62e590bb3d6009447a52760e9343c25a3bf7a8a7b0ad7ab5a77c5324fcaa957" dependencies = [ "auto_enums", "bytemuck", @@ -3179,9 +3150,9 @@ dependencies = [ [[package]] name = "i-slint-core-macros" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d05101fe547b31ed594d384f69489148444e66940be6ff798f41ed9a4262c33" +checksum = "62a416f1e9fc42c2bf1f171e5be38a8155850fcd390fce300869bcc9d6c9c117" dependencies = [ "quote", "syn 2.0.37", @@ -3189,9 +3160,9 @@ dependencies = [ [[package]] name = "i-slint-renderer-femtovg" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c204112be845815137425ff66c23f5fb17901f6b4c29eb2a96c0cae9f53d5ff" +checksum = "9e99a941fca00b96a7756d56e4bc5e2876283f34c693eabc73585c0b91ab84f0" dependencies = [ "cfg-if", "const-field-offset", @@ -3223,9 +3194,9 @@ dependencies = [ [[package]] name = "i-slint-renderer-skia" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39604c8a4ecbe879a904835a433c6cc138377437ca9319522b0e8d9ffd5834f7" +checksum = "9f617268cfee53e1fa3fcab8f6ab2775deacfce74057386c4ad39ef2647f8db6" dependencies = [ "cfg-if", "cfg_aliases", @@ -3695,9 +3666,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -3773,9 +3744,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" [[package]] name = "lock_api" @@ -3912,9 +3883,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -5015,13 +4986,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", + "regex-automata 0.3.9", "regex-syntax 0.7.5", ] @@ -5036,9 +5007,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -5065,9 +5036,9 @@ checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes", @@ -5088,6 +5059,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-util", "tower-service", @@ -5183,9 +5155,9 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] @@ -5248,14 +5220,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.15" +version = "0.38.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys 0.4.8", "windows-sys 0.48.0", ] @@ -5621,9 +5593,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -5634,6 +5606,16 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -5706,9 +5688,9 @@ dependencies = [ [[package]] name = "slint" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d91e328408007b17882017be3235cd71077cefb3d774ce6b557eb7b7f4e113" +checksum = "c9a6f76430dde7dc57d374c37aa3103532813cc275a94b515b5907e91dd19334" dependencies = [ "const-field-offset", "i-slint-backend-selector", @@ -5723,9 +5705,9 @@ dependencies = [ [[package]] name = "slint-build" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106674271608638040b2faadc655f3295ed97e4e712cb57fff1fef593f57815f" +checksum = "c6edc7309a89f14c685086544ea3dbd7668ccdeb03d774f06879f38237e55815" dependencies = [ "i-slint-compiler", "spin_on", @@ -5743,9 +5725,9 @@ dependencies = [ [[package]] name = "slint-macros" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977d6dc66346557222e67fff0d4b55158015264dc469465a11d54564358a7577" +checksum = "33f96e5ea0574ac69b773b159d43124f7a329107cf60c11516e63d38c2d8c89c" dependencies = [ "i-slint-compiler", "proc-macro2", @@ -6064,16 +6046,37 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "system-deps" -version = "6.1.1" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.7.8", + "toml 0.8.2", "version-compare", ] @@ -6371,7 +6374,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.15", + "rustix 0.38.17", "windows-sys 0.48.0", ] @@ -6535,7 +6538,7 @@ checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" dependencies = [ "as-raw-xcb-connection", "ctor 0.2.5", - "libloading 0.8.0", + "libloading 0.8.1", "tracing", ] @@ -6616,14 +6619,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.1", + "toml_edit 0.20.2", ] [[package]] @@ -6650,9 +6653,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap 2.0.2", "serde", @@ -7423,7 +7426,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.15", + "rustix 0.38.17", ] [[package]] @@ -7688,9 +7691,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winit" -version = "0.28.6" +version = "0.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ "android-activity", "bitflags 1.3.2", @@ -7936,9 +7939,9 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmlwriter" @@ -7965,7 +7968,7 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", diff --git a/Cargo.toml b/Cargo.toml index a6909e0b..44a11d85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,9 @@ resolver = "2" [workspace.package] authors = ["CrabNebula Ltd."] +edition = "2021" +license = "Apache-2.0 OR MIT" +repository = "https://github.com/crabnebula-dev/cargo-packager" [workspace.dependencies] thiserror = "1.0.49" diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 8c5c70e9..3cae3c0b 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -7,9 +7,9 @@ authors = [ "Tauri Programme within The Commons Conservancy", "George Burton " ] -edition = "2021" -license = "Apache-2.0 OR MIT" -repository = "https://github.com/crabnebula-dev/cargo-packager" +edition.workspace = true +license.workspace = true +repository.workspace = true [features] clap = [ "dep:clap" ] diff --git a/crates/config_schema_generator/Cargo.toml b/crates/config_schema_generator/Cargo.toml index d0652504..80b991e6 100644 --- a/crates/config_schema_generator/Cargo.toml +++ b/crates/config_schema_generator/Cargo.toml @@ -2,9 +2,10 @@ name = "cargo-packager-config-schema-generator" version = "0.0.0" publish = false -edition = "2021" -authors = ["CrabNebula Ltd."] -license = "Apache-2.0 OR MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true [build-dependencies] cargo-packager-config = { path = "../config" } diff --git a/crates/packager/Cargo.toml b/crates/packager/Cargo.toml index 1dca0f30..b954a601 100644 --- a/crates/packager/Cargo.toml +++ b/crates/packager/Cargo.toml @@ -2,13 +2,14 @@ name = "cargo-packager" version = "0.1.2" description = "Rust executable packager and bundler CLI and library." +edition.workspace = true +license.workspace = true +repository.workspace = true authors = [ "CrabNebula Ltd.", "Tauri Programme within The Commons Conservancy", "George Burton " ] -edition = "2021" -license = "Apache-2.0 OR MIT" keywords = [ "bundle", "package", "cargo" ] categories = [ "command-line-interface", @@ -17,7 +18,6 @@ categories = [ "development-tools::build-utils", "os" ] -repository = "https://github.com/crabnebula-dev/cargo-packager" [package.metadata.docs.rs] rustdoc-args = [ "--cfg", "doc_cfg" ] diff --git a/crates/updater/Cargo.toml b/crates/updater/Cargo.toml index ddbddbd5..8cfaeee1 100644 --- a/crates/updater/Cargo.toml +++ b/crates/updater/Cargo.toml @@ -3,8 +3,8 @@ name = "cargo-packager-updater" version = "0.0.0" description = "Rust executable updater." authors.workspace = true -edition = "2021" -license = "Apache-2.0 OR MIT" -repository = "https://github.com/crabnebula-dev/cargo-packager" +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] diff --git a/deny.toml b/deny.toml new file mode 100644 index 00000000..d290277d --- /dev/null +++ b/deny.toml @@ -0,0 +1,48 @@ +# Target triples to include when checking. This is essentially our supported target list. +targets = [ + { triple = "x86_64-unknown-linux-gnu" }, + { triple = "aarch64-unknown-linux-gnu" }, + { triple = "x86_64-pc-windows-msvc" }, + { triple = "x86_64-apple-darwin" }, + { triple = "aarch64-apple-darwin" }, +] + +# exclude examples and their dependecies +exclude = ["dioxus-example", "egui-example", "slint-example", "tauri-example", "wry-example"] + +[licenses] +# List of explicitly allowed licenses +# See https://spdx.org/licenses/ for list of possible licenses +# [possible values: any SPDX 3.11 short identifier (+ optional exception)]. +allow = [ + "MIT", + "Apache-2.0", + "ISC", + # Apparently for us it's equivalent to BSD-3 which is considered compatible with MIT and Apache-2.0 + "Unicode-DFS-2016", + # Used by webpki-roots and option-ext which we are using without modifications in a larger work, therefore okay. + "MPL-2.0", + "BSD-3-Clause", + "OpenSSL", + "Zlib" +] + +# Sigh +[[licenses.clarify]] +name = "ring" +# SPDX considers OpenSSL to encompass both the OpenSSL and SSLeay licenses +# https://spdx.org/licenses/OpenSSL.html +# ISC - Both BoringSSL and ring use this for their new files +# MIT - "Files in third_party/ have their own licenses, as described therein. The MIT +# license, for third_party/fiat, which, unlike other third_party directories, is +# compiled into non-test libraries, is included below." +# OpenSSL - Obviously +expression = "ISC AND MIT AND OpenSSL" +license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }] + +[licenses.private] +# If true, ignores workspace crates that aren't published, or are only +# published to private registries. +# To see how to mark a crate as unpublished (to the official registry), +# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field. +ignore = true \ No newline at end of file diff --git a/examples/dioxus/Cargo.toml b/examples/dioxus/Cargo.toml index 4e3e03c8..14d16759 100644 --- a/examples/dioxus/Cargo.toml +++ b/examples/dioxus/Cargo.toml @@ -2,6 +2,7 @@ name = "dioxus-example" version = "0.0.0" edition = "2021" +publish = false [dependencies] dioxus = "0.4" diff --git a/examples/egui/Cargo.toml b/examples/egui/Cargo.toml index 09d46122..8b6ebeae 100644 --- a/examples/egui/Cargo.toml +++ b/examples/egui/Cargo.toml @@ -2,6 +2,7 @@ name = "egui-example" version = "0.0.0" edition = "2021" +publish = false [dependencies] eframe = "0.22" diff --git a/examples/slint/Cargo.toml b/examples/slint/Cargo.toml index 8943c23c..c421c644 100644 --- a/examples/slint/Cargo.toml +++ b/examples/slint/Cargo.toml @@ -2,6 +2,7 @@ name = "slint-example" version = "0.0.0" edition = "2021" +publish = false [dependencies] slint = "1.0" diff --git a/examples/tauri/Cargo.toml b/examples/tauri/Cargo.toml index aa9619e3..458190ca 100644 --- a/examples/tauri/Cargo.toml +++ b/examples/tauri/Cargo.toml @@ -2,6 +2,7 @@ name = "tauri-example" version = "0.0.0" edition = "2021" +publish = false [build-dependencies] tauri-build = { version = "=2.0.0-alpha.6", features = [] } diff --git a/examples/wry/Cargo.toml b/examples/wry/Cargo.toml index 968b82c6..b3a5a130 100644 --- a/examples/wry/Cargo.toml +++ b/examples/wry/Cargo.toml @@ -2,6 +2,7 @@ name = "wry-example" version = "0.0.0" edition = "2021" +publish = false [dependencies] wry = "0.28"