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

Bump MSRV to 1.74 #478

Merged
merged 1 commit into from
Jun 4, 2024
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
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI

on:
on:
pull_request:
push:
branches: main
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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

Expand All @@ -96,7 +96,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@nightly
with:
Expand All @@ -121,7 +121,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
Expand All @@ -140,7 +140,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@nightly

Expand All @@ -244,7 +244,7 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion export_schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions make_test_images/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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",
Expand All @@ -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"

7 changes: 4 additions & 3 deletions sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -59,7 +59,6 @@ name = "v2api"
required-features = ["unstable_api"]



[lib]
crate-type = ["lib"]

Expand Down Expand Up @@ -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"
Expand Down
Loading