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

Upgrade uuid to 1.7.0 & fix removed wasm-bindgen feature #450

Merged
merged 5 commits into from
Jul 16, 2024

Conversation

diliop
Copy link
Contributor

@diliop diliop commented Apr 23, 2024

Changes in this pull request

Since uuid PR #536 the wasm-bindgen feature has be renamed to js and since PR #727, the wasm-bindgen dependency is optional and marked so using dep:wasm-bindgen under the js feature. With both these in place, given a Cargo.toml file that depends on uuid = "1.7.0":

[package]
name = "some_bin"
version = "0.1.0"
edition = "2021"

[dependencies]
uuid = "1.7.0"
c2pa = "0.29.1"

running cargo build will generate the following error:

error: failed to select a version for `uuid`.
    ... required by package `c2pa v0.29.1`
    ... which satisfies dependency `c2pa = "^0.29.1"` of package `some_bin v0.1.0 (/home/diliopoulos/bucket/some_bin)`
versions that meet the requirements `^1.3.1` are: 1.8.0, 1.7.0, 1.6.1, 1.6.0, 1.5.0, 1.4.1, 1.4.0, 1.3.4, 1.3.3, 1.3.2, 1.3.1

the package `c2pa` depends on `uuid`, with features: `wasm-bindgen` but `uuid` does not have these features.
 It has an optional dependency with that name, but that dependency uses the "dep:" syntax in the features table, so it does not have an implicit feature with that name.


all possible versions conflict with previously selected packages.

  previously selected package `uuid v1.7.0`
    ... which satisfies dependency `uuid = "^1.7.0"` of package `some_bin v0.1.0 (/home/diliopoulos/bucket/some_bin)`

failed to select a version for `uuid` which could resolve this conflict

Upgrading uuid to 1.70.0 and replacing the wasm-bindgen feature with js in sdk/Cargo.toml fixes the above.

Checklist

  • This PR represents a single feature, fix, or change.
  • All applicable changes have been documented.
  • Any TO DO items (or similar) have been entered as GitHub issues and the link to that issue has been included in a comment.

@diliop diliop changed the title Upgrade uuid to 1.7.0 to address & fix removed wasm-bindgen feature Upgrade uuid to 1.7.0 & fix removed wasm-bindgen feature Apr 23, 2024
@gpeacock
Copy link
Collaborator

gpeacock commented May 1, 2024

Hi, thanks for submitting this. It is ready to go except for the Adobe CLA requirement.
It basically just says you agree to not contribute anything that you don't have the rights to contribute.
https://opensource.adobe.com/cla.html

@diliop
Copy link
Contributor Author

diliop commented May 22, 2024

@gpeacock I signed the Adobe CLA a while back, let me know if there is anything else you need from me to merge this

@gpeacock gpeacock merged commit 1bbe66b into contentauth:main Jul 16, 2024
21 checks passed
facebook-github-bot pushed a commit to facebookincubator/reindeer that referenced this pull request Jul 19, 2024
Summary: The git hash points to [#450](contentauth/c2pa-rs#450) which was posted upstream to accommodate the `pyo3` upgrade to `0.21.1` (D56671179). The PR was merged in [`c2pa = 0.32.7`](https://github.com/contentauth/c2pa-rs/releases/tag/v0.32.7).

Reviewed By: dtolnay

Differential Revision:
D59975108

Privacy Context Container: L1122763

fbshipit-source-id: 75355f690075245065d0753ac526c17a0889932e
facebook-github-bot pushed a commit to facebook/hhvm that referenced this pull request Jul 19, 2024
Summary: The git hash points to [#450](contentauth/c2pa-rs#450) which was posted upstream to accommodate the `pyo3` upgrade to `0.21.1` (D56671179). The PR was merged in [`c2pa = 0.32.7`](https://github.com/contentauth/c2pa-rs/releases/tag/v0.32.7).

Reviewed By: dtolnay

Differential Revision:
D59975108

Privacy Context Container: L1122763

fbshipit-source-id: 75355f690075245065d0753ac526c17a0889932e
facebook-github-bot pushed a commit to facebook/dotslash that referenced this pull request Jul 19, 2024
Summary: The git hash points to [#450](contentauth/c2pa-rs#450) which was posted upstream to accommodate the `pyo3` upgrade to `0.21.1` (D56671179). The PR was merged in [`c2pa = 0.32.7`](https://github.com/contentauth/c2pa-rs/releases/tag/v0.32.7).

Reviewed By: dtolnay

Differential Revision:
D59975108

Privacy Context Container: L1122763

fbshipit-source-id: 75355f690075245065d0753ac526c17a0889932e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants