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

chore: fixed resolver issue #7743

Closed
wants to merge 444 commits into from

Conversation

martinfrances107
Copy link
Contributor

This PR resolves a warning seen while running cargo update

warning: some crates are on edition 2021 which defaults to resolver = "2", but virtual workspaces default to resolver = "1"
note: to keep the current resolver, specify workspace.resolver = "1" in the workspace root's manifest
note: to use the edition 2021 resolver, specify workspace.resolver = "2" in the workspace root's manifest

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Docs
  • New Binding issue #___
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change?

  • Yes, and the changes were approved in issue #___
  • No

Checklist

  • When resolving issues, they are referenced in the PR's title (e.g fix: remove a typo, closes #___, #___)
  • A change file is added if any packages will require a version bump due to this PR per the instructions in the readme.
  • I have added a convincing reason for adding this feature, if necessary

lucasfernog and others added 30 commits February 22, 2023 13:55
* fix: update nodejs detection in mobile commands

* changefile
* feat(cli): add `--force-ip-prompt`

* Restore tooling/cli/Cargo.lock

* Restore tooling/cli/Cargo.toml

* fix macos build
…uri (tauri-apps#6448)

* fix(cli): use `npm run tauri -- foo` for correctly pass args to tauri

* fix xcode-script current dir, GCC_PREPROCESSOR_DEFINITIONS optional

---------

Co-authored-by: Lucas Nogueira <[email protected]>
* feat(core): update swift-rs

* update tauri-plugin-log

* use env var for min iOS version

* test x86_64-apple-ios

* Revert "test x86_64-apple-ios"

This reverts commit 3ae6b79.

* chore: swift min version 5.3 [skip ci]

* fix build [skip ci]

* fix cgrect usage

* test CI

* Revert "test CI"

This reverts commit 76ce0c5.

* update swift-rs to 1.0.1

* lint

* lint [skip ci]
…i-apps#6468)

* refactor(core): remove attohttpc client, closes tauri-apps#6415

* lint [skip ci]
* chore(deps): pin wry to 0.27

* update index.js [skip ci]

* fmt
…i-apps#6476)

* fix(ios): link clang_rt.ios to include isPlatformVersionAtLeast

See alexcrichton/curl-rust#283

* lint [skip ci]

* update swift-rs to 1.0.2
renovate bot and others added 20 commits August 10, 2023 07:22
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lucas Nogueira <[email protected]>
Co-authored-by: Lucas Fernandes Nogueira <[email protected]>
Co-authored-by: Lucas Nogueira <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lucas Nogueira <[email protected]>
Co-authored-by: Lucas Nogueira <[email protected]>
Co-authored-by: lucasfernog <[email protected]>
Co-authored-by: Lucas Nogueira <[email protected]>
…-apps#7624)

* Create Bulgarian.nsh

* Update nsis.rs

* Create nsis-bulgarian.md
…i-apps#7619)

* feat(tauri): impl Send for app::Builder

* chore: add .changes/app-builder-send.md
seen while running cargo update

warning: some crates are on edition 2021 which defaults to `resolver = "2"`, but virtual workspaces default to `resolver = "1"`
note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest
note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest
@martinfrances107 martinfrances107 requested a review from a team as a code owner September 4, 2023 12:31
@amrbashir
Copy link
Member

Oh looks like you didn't sign your commits and I can't merge the PR unless they are signed. You need to setup commit signing, then you can sign past commit like this for example.

Also could you rebase and target 1.x branch which will be merged later into dev?

@martinfrances107
Copy link
Contributor Author

martinfrances107 commented Sep 4, 2023

Thank you and Ah I screwed up again .. I push the amended and signed version to dev ... one sec I will target 1.x as you asked.

@martinfrances107 martinfrances107 changed the base branch from dev to 1.x September 4, 2023 13:54
@amrbashir
Copy link
Member

You need to rebase your branch as well to have 1.x as a base not dev so you don't pull this changes. Might be easier to just close this PR and open a new one.

@amrbashir amrbashir closed this Sep 4, 2023
@amrbashir
Copy link
Member

Closed in favor of #7747

@martinfrances107
Copy link
Contributor Author

You need to rebase your branch as well to have 1.x as a base not dev so you don't pull this changes. Might be easier to just close this PR and open a new one.

Agreed here is the new PR #7747

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 📬Proposal
Development

Successfully merging this pull request may close these issues.