From c2802a95d8ac227ece5f2b92e064d97a8da1e7a6 Mon Sep 17 00:00:00 2001 From: Kaur Kuut Date: Wed, 1 Jun 2022 15:22:52 +0300 Subject: [PATCH 1/4] Increase version to v0.6.0. --- piet-cairo/Cargo.toml | 8 ++++---- piet-common/Cargo.toml | 14 +++++++------- piet-coregraphics/Cargo.toml | 8 ++++---- piet-direct2d/Cargo.toml | 8 ++++---- piet-svg/Cargo.toml | 6 +++--- piet-web/Cargo.toml | 4 ++-- piet/Cargo.toml | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/piet-cairo/Cargo.toml b/piet-cairo/Cargo.toml index 878c76c1..b2052af7 100644 --- a/piet-cairo/Cargo.toml +++ b/piet-cairo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "piet-cairo" -version = "0.5.0" +version = "0.6.0" authors = ["Raph Levien "] description = "Cairo backend for piet 2D graphics abstraction." license = "MIT/Apache-2.0" @@ -11,7 +11,7 @@ keywords = ["graphics", "2d"] categories = ["rendering::graphics-api"] [dependencies] -piet = { version = "=0.5.0", path = "../piet" } +piet = { version = "=0.6.0", path = "../piet" } cairo-rs = { version = "0.16.3", default-features = false } # We don't need glib pango = { version = "0.16.3", features = ["v1_44"] } @@ -20,8 +20,8 @@ unicode-segmentation = "1.3.0" xi-unicode = "0.3.0" [dev-dependencies] -piet = { version = "=0.5.0", path = "../piet", features = ["samples"] } -piet-common = { version = "=0.5.0", path = "../piet-common", features = ["png"] } +piet = { version = "=0.6.0", path = "../piet", features = ["samples"] } +piet-common = { version = "=0.6.0", path = "../piet-common", features = ["png"] } criterion = "0.3" [[bench]] diff --git a/piet-common/Cargo.toml b/piet-common/Cargo.toml index f2c69bd2..192db7d7 100644 --- a/piet-common/Cargo.toml +++ b/piet-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "piet-common" -version = "0.5.0" +version = "0.6.0" authors = ["Raph Levien "] description = "Selection of a single preferred back-end for piet" license = "MIT/Apache-2.0" @@ -33,25 +33,25 @@ hdr = ["piet/hdr"] serde = ["piet/serde"] [dependencies] -piet = { version = "=0.5.0", path = "../piet" } -piet-web = { version = "=0.5.0", path = "../piet-web", optional = true } +piet = { version = "=0.6.0", path = "../piet" } +piet-web = { version = "=0.6.0", path = "../piet-web", optional = true } cfg-if = "1.0" png = { version = "0.17", optional = true } [target.'cfg(any(target_os="linux", target_os="openbsd", target_os="freebsd", target_os="netbsd"))'.dependencies] -piet-cairo = { version = "=0.5.0", path = "../piet-cairo" } +piet-cairo = { version = "=0.6.0", path = "../piet-cairo" } cairo-rs = { version = "0.16.3", default_features = false } cairo-sys-rs = { version = "0.16.3" } [target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies] -piet-coregraphics = { version = "=0.5.0", path = "../piet-coregraphics" } +piet-coregraphics = { version = "=0.6.0", path = "../piet-coregraphics" } core-graphics = { version = "0.22.2" } [target.'cfg(target_os="windows")'.dependencies] -piet-direct2d = { version = "=0.5.0", path = "../piet-direct2d" } +piet-direct2d = { version = "=0.6.0", path = "../piet-direct2d" } [target.'cfg(target_arch="wasm32")'.dependencies] -piet-web = { version = "=0.5.0", path = "../piet-web" } +piet-web = { version = "=0.6.0", path = "../piet-web" } wasm-bindgen = "0.2.59" [target.'cfg(target_arch="wasm32")'.dev-dependencies] diff --git a/piet-coregraphics/Cargo.toml b/piet-coregraphics/Cargo.toml index 3ac6fc5e..e2426788 100644 --- a/piet-coregraphics/Cargo.toml +++ b/piet-coregraphics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "piet-coregraphics" -version = "0.5.0" +version = "0.6.0" authors = ["Jeff Muizelaar , Raph Levien , Colin Rofls "] description = "CoreGraphics backend for piet 2D graphics abstraction." license = "MIT/Apache-2.0" @@ -11,7 +11,7 @@ keywords = ["graphics", "2d"] categories = ["rendering::graphics-api"] [dependencies] -piet = { version = "=0.5.0", path = "../piet" } +piet = { version = "=0.6.0", path = "../piet" } foreign-types = "0.3.2" core-graphics = "0.22.2" @@ -21,5 +21,5 @@ core-foundation-sys = "0.8" associative-cache = "1.0" [dev-dependencies] -piet = { version = "=0.5.0", path = "../piet", features = ["samples"] } -piet-common = { version = "=0.5.0", path = "../piet-common", features = ["png"] } +piet = { version = "=0.6.0", path = "../piet", features = ["samples"] } +piet-common = { version = "=0.6.0", path = "../piet-common", features = ["png"] } diff --git a/piet-direct2d/Cargo.toml b/piet-direct2d/Cargo.toml index ec638490..f2e0cd19 100644 --- a/piet-direct2d/Cargo.toml +++ b/piet-direct2d/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "piet-direct2d" -version = "0.5.0" +version = "0.6.0" authors = ["Raph Levien "] description = "Direct2D backend for piet 2D graphics abstraction." license = "MIT/Apache-2.0" @@ -11,7 +11,7 @@ keywords = ["graphics", "2d"] categories = ["rendering::graphics-api"] [dependencies] -piet = { version = "=0.5.0", path = "../piet" } +piet = { version = "=0.6.0", path = "../piet" } utf16_lit = "2.0" associative-cache = "1.0" @@ -20,5 +20,5 @@ winapi = { version = "0.3.8", features = ["d2d1", "d2d1_1", "d2d1effects", "d2db dwrote = { version = "0.11.0", default_features = false } [dev-dependencies] -piet = { version = "=0.5.0", path = "../piet", features = ["samples"] } -piet-common = { version = "=0.5.0", path = "../piet-common", features = ["png"] } +piet = { version = "=0.6.0", path = "../piet", features = ["samples"] } +piet-common = { version = "=0.6.0", path = "../piet-common", features = ["png"] } diff --git a/piet-svg/Cargo.toml b/piet-svg/Cargo.toml index ff54d42a..43aba3ae 100644 --- a/piet-svg/Cargo.toml +++ b/piet-svg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "piet-svg" -version = "0.5.0" +version = "0.6.0" authors = ["Benjamin Saunders "] description = "SVG backend for piet 2D graphics abstraction." edition = "2018" @@ -18,9 +18,9 @@ base64 = "0.13.0" evcxr_runtime = { version = "1.1.0", optional = true } font-kit = "0.10.1" image = { version = "0.24.0", default-features = false, features = ["png"] } -piet = { version = "=0.5.0", path = "../piet" } +piet = { version = "=0.6.0", path = "../piet" } rustybuzz = "0.4.0" svg = "0.10.0" [dev-dependencies] -piet = { version = "=0.5.0", path = "../piet", features = ["samples"] } +piet = { version = "=0.6.0", path = "../piet", features = ["samples"] } diff --git a/piet-web/Cargo.toml b/piet-web/Cargo.toml index 979584f4..75280049 100644 --- a/piet-web/Cargo.toml +++ b/piet-web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "piet-web" -version = "0.5.0" +version = "0.6.0" authors = ["Raph Levien "] description = "Web canvas backend for piet 2D graphics abstraction." license = "MIT/Apache-2.0" @@ -14,7 +14,7 @@ categories = ["rendering::graphics-api", "wasm"] crate-type = ["cdylib", "rlib"] [dependencies] -piet = { version = "=0.5.0", path = "../piet" } +piet = { version = "=0.6.0", path = "../piet" } unicode-segmentation = "1.6.0" xi-unicode = "0.3.0" diff --git a/piet/Cargo.toml b/piet/Cargo.toml index 9291b7fe..ddd7aae0 100644 --- a/piet/Cargo.toml +++ b/piet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "piet" -version = "0.5.0" +version = "0.6.0" authors = ["Raph Levien "] description = "An abstraction for 2D graphics." license = "MIT/Apache-2.0" From 53b932aa65ad12c56967d76666e41315e6e94716 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Wed, 23 Nov 2022 17:28:42 -0600 Subject: [PATCH 2/4] Update dependencies explicitly to the latest compatible versions. --- piet-cairo/Cargo.toml | 4 ++-- piet-common/Cargo.toml | 18 +++++++++--------- piet-coregraphics/Cargo.toml | 10 +++++----- piet-direct2d/Cargo.toml | 6 +++--- piet-svg/Cargo.toml | 2 +- piet-web/Cargo.toml | 12 ++++++------ piet-web/examples/basic/Cargo.toml | 6 +++--- piet/Cargo.toml | 12 ++++++------ 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/piet-cairo/Cargo.toml b/piet-cairo/Cargo.toml index b2052af7..a7b26613 100644 --- a/piet-cairo/Cargo.toml +++ b/piet-cairo/Cargo.toml @@ -16,13 +16,13 @@ piet = { version = "=0.6.0", path = "../piet" } cairo-rs = { version = "0.16.3", default-features = false } # We don't need glib pango = { version = "0.16.3", features = ["v1_44"] } pangocairo = "0.16.3" -unicode-segmentation = "1.3.0" +unicode-segmentation = "1.9.0" xi-unicode = "0.3.0" [dev-dependencies] piet = { version = "=0.6.0", path = "../piet", features = ["samples"] } piet-common = { version = "=0.6.0", path = "../piet-common", features = ["png"] } -criterion = "0.3" +criterion = "0.3.5" [[bench]] name = "make_image" diff --git a/piet-common/Cargo.toml b/piet-common/Cargo.toml index 192db7d7..e3c75408 100644 --- a/piet-common/Cargo.toml +++ b/piet-common/Cargo.toml @@ -35,8 +35,8 @@ serde = ["piet/serde"] [dependencies] piet = { version = "=0.6.0", path = "../piet" } piet-web = { version = "=0.6.0", path = "../piet-web", optional = true } -cfg-if = "1.0" -png = { version = "0.17", optional = true } +cfg-if = "1.0.0" +png = { version = "0.17.5", optional = true } [target.'cfg(any(target_os="linux", target_os="openbsd", target_os="freebsd", target_os="netbsd"))'.dependencies] piet-cairo = { version = "=0.6.0", path = "../piet-cairo" } @@ -45,21 +45,21 @@ cairo-sys-rs = { version = "0.16.3" } [target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies] piet-coregraphics = { version = "=0.6.0", path = "../piet-coregraphics" } -core-graphics = { version = "0.22.2" } +core-graphics = { version = "0.22.3" } [target.'cfg(target_os="windows")'.dependencies] piet-direct2d = { version = "=0.6.0", path = "../piet-direct2d" } [target.'cfg(target_arch="wasm32")'.dependencies] piet-web = { version = "=0.6.0", path = "../piet-web" } -wasm-bindgen = "0.2.59" +wasm-bindgen = "0.2.80" [target.'cfg(target_arch="wasm32")'.dev-dependencies] -getrandom = { version = "0.2.3", features = ["js"] } -wasm-bindgen-test = "0.3.13" +getrandom = { version = "0.2.6", features = ["js"] } +wasm-bindgen-test = "0.3.30" [target.'cfg(target_arch="wasm32")'.dependencies.web-sys] -version = "0.3.36" +version = "0.3.57" features = [ "console", "Window", @@ -76,5 +76,5 @@ features = [ [dev-dependencies] static_assertions = "1.1.0" -rand = "0.8.4" -rand_distr = "0.4.1" +rand = "0.8.5" +rand_distr = "0.4.3" diff --git a/piet-coregraphics/Cargo.toml b/piet-coregraphics/Cargo.toml index e2426788..52596bb3 100644 --- a/piet-coregraphics/Cargo.toml +++ b/piet-coregraphics/Cargo.toml @@ -14,11 +14,11 @@ categories = ["rendering::graphics-api"] piet = { version = "=0.6.0", path = "../piet" } foreign-types = "0.3.2" -core-graphics = "0.22.2" -core-text = "19.0.0" -core-foundation = "0.9" -core-foundation-sys = "0.8" -associative-cache = "1.0" +core-graphics = "0.22.3" +core-text = "19.2.0" +core-foundation = "0.9.3" +core-foundation-sys = "0.8.3" +associative-cache = "1.0.1" [dev-dependencies] piet = { version = "=0.6.0", path = "../piet", features = ["samples"] } diff --git a/piet-direct2d/Cargo.toml b/piet-direct2d/Cargo.toml index f2e0cd19..70703fc2 100644 --- a/piet-direct2d/Cargo.toml +++ b/piet-direct2d/Cargo.toml @@ -12,11 +12,11 @@ categories = ["rendering::graphics-api"] [dependencies] piet = { version = "=0.6.0", path = "../piet" } -utf16_lit = "2.0" -associative-cache = "1.0" +utf16_lit = "2.0.2" +associative-cache = "1.0.1" wio = "0.2.2" -winapi = { version = "0.3.8", features = ["d2d1", "d2d1_1", "d2d1effects", "d2dbasetypes", "dcommon", "d3d11", "dxgi", "winnls"] } +winapi = { version = "0.3.9", features = ["d2d1", "d2d1_1", "d2d1effects", "d2dbasetypes", "dcommon", "d3d11", "dxgi", "winnls"] } dwrote = { version = "0.11.0", default_features = false } [dev-dependencies] diff --git a/piet-svg/Cargo.toml b/piet-svg/Cargo.toml index 43aba3ae..38413b90 100644 --- a/piet-svg/Cargo.toml +++ b/piet-svg/Cargo.toml @@ -17,7 +17,7 @@ evcxr = ["evcxr_runtime"] base64 = "0.13.0" evcxr_runtime = { version = "1.1.0", optional = true } font-kit = "0.10.1" -image = { version = "0.24.0", default-features = false, features = ["png"] } +image = { version = "0.24.2", default-features = false, features = ["png"] } piet = { version = "=0.6.0", path = "../piet" } rustybuzz = "0.4.0" svg = "0.10.0" diff --git a/piet-web/Cargo.toml b/piet-web/Cargo.toml index 75280049..1689a625 100644 --- a/piet-web/Cargo.toml +++ b/piet-web/Cargo.toml @@ -16,22 +16,22 @@ crate-type = ["cdylib", "rlib"] [dependencies] piet = { version = "=0.6.0", path = "../piet" } -unicode-segmentation = "1.6.0" +unicode-segmentation = "1.9.0" xi-unicode = "0.3.0" -wasm-bindgen = "0.2.70" -js-sys = "0.3.47" +wasm-bindgen = "0.2.80" +js-sys = "0.3.57" [dependencies.web-sys] -version = "0.3.47" +version = "0.3.57" features = ["Window", "CanvasGradient", "CanvasRenderingContext2d", "CanvasWindingRule", "Document", "DomMatrix", "Element", "HtmlCanvasElement", "ImageBitmap", "ImageData", "TextMetrics"] [dev-dependencies] -wasm-bindgen-test = "0.3.0" +wasm-bindgen-test = "0.3.30" [dev-dependencies.web-sys] -version = "0.3.47" +version = "0.3.57" features = ["console", "Window", "CanvasGradient", "CanvasRenderingContext2d", "CanvasWindingRule", "Document", "DomMatrix", "Element", "HtmlCanvasElement", "ImageBitmap", "ImageData", "TextMetrics"] diff --git a/piet-web/examples/basic/Cargo.toml b/piet-web/examples/basic/Cargo.toml index da17b734..847bfbc1 100644 --- a/piet-web/examples/basic/Cargo.toml +++ b/piet-web/examples/basic/Cargo.toml @@ -14,9 +14,9 @@ default = ["console_error_panic_hook"] piet = { path = "../../../piet", features = ["samples"] } piet-web = { path = "../.." } -wasm-bindgen = "0.2.30" -console_error_panic_hook = { version = "0.1.6", optional = true } +wasm-bindgen = "0.2.80" +console_error_panic_hook = { version = "0.1.7", optional = true } [dependencies.web-sys] -version = "0.3.10" +version = "0.3.57" features = ["console", "CanvasRenderingContext2d", "Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement"] diff --git a/piet/Cargo.toml b/piet/Cargo.toml index ddd7aae0..35990c31 100644 --- a/piet/Cargo.toml +++ b/piet/Cargo.toml @@ -12,12 +12,12 @@ categories = ["rendering::graphics-api"] include = ["src/**/*", "Cargo.toml", "snapshots/resources/*"] [dependencies] -image = { version = "0.24.0", optional = true, default-features = false } -kurbo = "0.8.2" -pico-args = { version = "0.4.0", optional = true } -png = { version = "0.17", optional = true } -os_info = { version = "3.0.0", optional = true, default-features = false } -unic-bidi = "0.9" +image = { version = "0.24.2", optional = true, default-features = false } +kurbo = "0.8.3" +pico-args = { version = "0.4.2", optional = true } +png = { version = "0.17.5", optional = true } +os_info = { version = "3.4.0", optional = true, default-features = false } +unic-bidi = "0.9.0" [features] samples = ["pico-args", "png", "os_info"] From 1a1d35e02212b2086163c44b9b8ec11be8de5886 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Wed, 23 Nov 2022 18:29:01 -0600 Subject: [PATCH 3/4] Bump kurbo too. --- piet/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piet/Cargo.toml b/piet/Cargo.toml index 35990c31..79d8ac04 100644 --- a/piet/Cargo.toml +++ b/piet/Cargo.toml @@ -13,7 +13,7 @@ include = ["src/**/*", "Cargo.toml", "snapshots/resources/*"] [dependencies] image = { version = "0.24.2", optional = true, default-features = false } -kurbo = "0.8.3" +kurbo = "0.9" pico-args = { version = "0.4.2", optional = true } png = { version = "0.17.5", optional = true } os_info = { version = "3.4.0", optional = true, default-features = false } From fe814aa81fcde5b7a336ec914c3024f56a0fcb33 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Wed, 23 Nov 2022 18:42:58 -0600 Subject: [PATCH 4/4] Do the wasm-pack test in the wasm clippy job. This way it will use the same toolchain. --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8131a3f2..03ea9194 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -195,11 +195,6 @@ jobs: command: test args: --manifest-path=piet-common/Cargo.toml --features=png --no-run --target wasm32-unknown-unknown - test-wasm-pack: - runs-on: ubuntu-latest - name: wasm-pack test - steps: - - uses: actions/checkout@v2 - name: Install wasm-pack run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: test chrome