commit c884f30e3d4000171b5fabefbc4b73b38b9c1338
parent f8c9be35af153d539486d86707da7a86a7c99f07
Author: Dave Kozma <dkozma@adobe.com>
Date: Tue, 4 Jun 2024 16:06:53 -0400
Bump MSRV to 1.74 (#478)
Diffstat:
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,6 @@
name: CI
-on:
+on:
pull_request:
push:
branches: main
@@ -16,12 +16,12 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
- rust_version: [stable, 1.73.0]
+ rust_version: [stable, 1.74.0]
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
@@ -31,7 +31,7 @@ jobs:
uses: Swatinem/rust-cache@v2
- name: Run unit tests
- run: cargo test --all-features --verbose
+ run: cargo test --all-features --verbose
tests-cross:
name: Unit tests
@@ -41,12 +41,12 @@ jobs:
fail-fast: false
matrix:
target: [aarch64-unknown-linux-gnu]
- rust_version: [stable, 1.73.0]
+ rust_version: [stable, 1.74.0]
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
@@ -73,10 +73,10 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
-
+
- name: Install wasm-pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
@@ -96,7 +96,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@nightly
with:
@@ -121,7 +121,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
@@ -140,7 +140,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
@@ -179,7 +179,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Install nightly Rust toolchain
# Nightly is used here because the docs.rs build
# uses nightly and we use doc_cfg features that are
@@ -225,7 +225,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@nightly
@@ -244,7 +244,7 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
-
+
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ We welcome contributions to this project. For information on contributing, prov
## Requirements
-The library requires **Rust version 1.73.0** or newer.
+The library requires **Rust version 1.74.0** or newer.
### Supported platforms
diff --git a/export_schema/Cargo.toml b/export_schema/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.32.1"
authors = ["Dave Kozma <dkozma@adobe.com>"]
license = "MIT OR Apache-2.0"
edition = "2018"
-rust-version = "1.73.0"
+rust-version = "1.74.0"
[dependencies]
anyhow = "1.0.40"
diff --git a/make_test_images/Cargo.toml b/make_test_images/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.32.1"
authors = ["Gavin Peacock <gpeacock@adobe.com>"]
license = "MIT OR Apache-2.0"
edition = "2021"
-rust-version = "1.73.0"
+rust-version = "1.74.0"
[dependencies]
anyhow = "1.0.40"
@@ -13,7 +13,7 @@ c2pa = { path = "../sdk", default-features = false, features = [
"unstable_api",
] }
env_logger = "0.10"
-log = "0.4.8"
+log = "0.4.8"
image = { version = "0.24.7", default-features = false, features = [
"jpeg",
"png",
@@ -24,4 +24,3 @@ regex = "1.5.6"
serde = "1.0.197"
serde_json = { version = "1.0.114", features = ["preserve_order"] }
tempfile = "3.10.1"
-
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -17,7 +17,7 @@ readme = "../README.md"
keywords = ["xmp", "metadata"]
categories = ["api-bindings"]
edition = "2021"
-rust-version = "1.73.0"
+rust-version = "1.74.0"
exclude = ["tests/fixtures"]
[package.metadata.docs.rs]
@@ -59,7 +59,6 @@ name = "v2api"
required-features = ["unstable_api"]
-
[lib]
crate-type = ["lib"]
@@ -161,7 +160,9 @@ web-sys = { version = "0.3.58", features = [
[dev-dependencies]
anyhow = "1.0.40"
mockall = "0.11.2"
-c2pa = { path = ".", features = ["unstable_api"] } # allow integration tests to use the new API
+c2pa = { path = ".", features = [
+ "unstable_api",
+] } # allow integration tests to use the new API
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = "0.3.31"