diff --git a/Cargo.lock b/Cargo.lock index fd4345fb1..51693203d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1191,7 +1191,7 @@ dependencies = [ [[package]] name = "craft-update" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1065653e75854e9c17e1ff563acdd344c1b185f0#1065653e75854e9c17e1ff563acdd344c1b185f0" +source = "git+https://github.com/storytold/craft-libs?rev=04aa1703b32d299e54f78fcde4182f2b393a9116#04aa1703b32d299e54f78fcde4182f2b393a9116" dependencies = [ "chrono", "dunce", diff --git a/Cargo.toml b/Cargo.toml index 220f29403..da6bca3b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,8 +65,8 @@ eframe = { version = "0.37", default-features = false } egui-wgpu = "0.37" # Monotonic time on native and web (performance.now on wasm). web-time = "1.1" -# craft-update with storytold/craft-libs#434: the update prompt shows the app's icon, accent and developer. -craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "1065653e75854e9c17e1ff563acdd344c1b185f0", features = ["egui"] } +# craft-update: app-specific pretend versions apply to startup and manual checks. +craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "04aa1703b32d299e54f78fcde4182f2b393a9116", features = ["egui"] } rfd = "0.17" arboard = { version = "3.6", default-features = false } diff --git a/contributors/people.toml b/contributors/people.toml index 101a329ac..28564415e 100644 --- a/contributors/people.toml +++ b/contributors/people.toml @@ -96,3 +96,6 @@ real_name = "Doan Huynh Huu Khuong" display_name = "Doan Huynh Huu Khuong" sync_github_name = false + +[people.dylanmtaylor] +sync_github_name = true diff --git a/xtask/src/layers.rs b/xtask/src/layers.rs index c23825d11..d8db1c526 100644 --- a/xtask/src/layers.rs +++ b/xtask/src/layers.rs @@ -170,6 +170,8 @@ pub fn check(crates: &[Crate]) -> Vec { Some(Class::Testkit) if d.kind != DepKind::Dev => { out.push(Violation::TestkitAsNormalDep { krate: c.name.clone() }); } + // Test support is allowed as a dev-dependency, regardless of its layer. + Some(Class::Testkit) => {} Some(dc) => { let to = dc.layer().unwrap_or(u8::MAX); if to >= layer && !(to == layer && intra_layer_allowed(&c.name, &d.name)) {