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.

Sign up for GitHub

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

Jump to bottom

fix(core): allow hyphens and underscores on identifiers, closes #9707 #10700

Merged
merged 8 commits into from
Aug 21, 2024
Merged

fix(core): allow hyphens and underscores on identifiers, closes #9707 #10700

merged 8 commits into from
Aug 21, 2024

Conversation

lucasfernog
Copy link
Member

No description provided.

@lucasfernog lucasfernog requested a review from a team as a code owner August 20, 2024 18:20
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 20, 2024 •
edited
Loading

Package Changes Through 003d8e8

There are 5 changes which include tauri-utils with prerelease, tauri-cli with prerelease, @tauri-apps/cli with prerelease, tauri-build with prerelease, tauri-runtime-wry with prerelease

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package current next
tauri-utils 2.0.0-rc.5 2.0.0-rc.6
tauri-bundler 2.0.1-rc.4 2.0.1-rc.5
tauri-runtime 2.0.0-rc.5 2.0.0-rc.6
tauri-runtime-wry 2.0.0-rc.5 2.0.0-rc.6
tauri-codegen 2.0.0-rc.5 2.0.0-rc.6
tauri-macros 2.0.0-rc.5 2.0.0-rc.6
tauri-plugin 2.0.0-rc.5 2.0.0-rc.6
tauri-build 2.0.0-rc.5 2.0.0-rc.6
tauri 2.0.0-rc.5 2.0.0-rc.6
@tauri-apps/cli 2.0.0-rc.6 2.0.0-rc.7
tauri-cli 2.0.0-rc.6 2.0.0-rc.7

Add another change file through the GitHub UI by following this link.

Read about change files or the docs at github.com/jbolda/covector

@lucasfernog lucasfernog marked this pull request as draft August 20, 2024 19:01
@lucasfernog
Copy link
Member Author

needs a wry fix i think

@lucasfernog
Copy link
Member Author

Needs tauri-apps/tao#964

@lucasfernog lucasfernog marked this pull request as ready for review August 21, 2024 03:00
pewsheen
pewsheen reviewed Aug 21, 2024
View reviewed changes
core/tauri-build/src/lib.rs Outdated
Comment on lines 479 to 481
println!("cargo:rustc-env=TAURI_ANDROID_PACKAGE_NAME_APP_NAME={w}");
} else {
android_package_prefix.push_str(w);
android_package_prefix.push_str(&w.replace(['_', '-'], "_1"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TAURI_ANDROID_PACKAGE_NAME_APP_NAME seemed to be replaced in

tauri/core/tauri-macros/src/mobile.rs

Lines 46 to 51 in 762cf31

let app_name = get_env_var(
"TAURI_ANDROID_PACKAGE_NAME_APP_NAME",
|r| r.replace('-', "_"),
&mut error,
&function,
);
before it calls android_binding!

Should we move that replacement to L479 as well? So that we can do it in one place.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea, pushed

@ConnorKrammer ConnorKrammer mentioned this pull request Aug 21, 2024
Closed
@pewsheen
Copy link
Contributor

needs a wry fix i think

Looks like we don't need it? Other than this one, I think it's good to merge

@lucasfernog
Copy link
Member Author

needs a wry fix i think

Looks like we don't need it? Other than this one, I think it's good to merge

yeah it was just the tao thing

@lucasfernog lucasfernog merged commit 793ee05 into dev Aug 21, 2024
30 of 31 checks passed
@lucasfernog lucasfernog deleted the fix/mobile-identifier branch August 21, 2024 16:46
This was referenced Aug 21, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pewsheen pewsheen pewsheen left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lucasfernog @pewsheen