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

feat: add iOS frameworks config option, closes #9962 #10393

Merged
merged 4 commits into from
Aug 2, 2024

Conversation

lucasfernog
Copy link
Member

No description provided.

@lucasfernog lucasfernog requested a review from a team as a code owner July 26, 2024 11:04
Copy link
Contributor

github-actions bot commented Jul 26, 2024

Package Changes Through d4a1942

There are 5 changes which include tauri-cli with prerelease, @tauri-apps/cli with prerelease, tauri with prerelease, tauri-plugin with prerelease, tauri-utils 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-beta.19 2.0.0-beta.20
tauri-bundler 2.0.1-beta.19 2.0.1-beta.20
tauri-runtime 2.0.0-beta.21 2.0.0-beta.22
tauri-runtime-wry 2.0.0-beta.21 2.0.0-beta.22
tauri-codegen 2.0.0-beta.19 2.0.0-beta.20
tauri-macros 2.0.0-beta.19 2.0.0-beta.20
tauri-plugin 2.0.0-beta.19 2.0.0-beta.20
tauri-build 2.0.0-beta.19 2.0.0-beta.20
tauri 2.0.0-beta.25 2.0.0-beta.26
@tauri-apps/cli 2.0.0-beta.23 2.0.0-beta.24
tauri-cli 2.0.0-beta.23 2.0.0-beta.24

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


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

Copy link
Contributor

@pewsheen pewsheen left a comment

Choose a reason for hiding this comment

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

CI - cli fails should be an issue of time-rs. It seemed to resolve the issue in 0.3.36

Comment on lines 112 to 117
- sdk: UIKit.framework
{{~#each ios-frameworks}}
- sdk: {{this}}.framework{{/each}}

- sdk: {{this}}.framework
{{/each}}
- sdk: WebKit.framework
Copy link
Contributor

@pewsheen pewsheen Jul 29, 2024

Choose a reason for hiding this comment

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

If there's no framework provided, it'll be like:

- sdk: UIKit.framework        - sdk: WebKit.framework

Played around, this one works for me:

- sdk: UIKit.framework{{#if this.ios-frameworks}}{{~#each ios-frameworks}}
- sdk: {{this}}.framework{{/each}}{{/if}}
- sdk: WebKit.framework

This one also fixs for ios-vendor-sdks if there are multiple vendor-sdks. But since we don't support inserting ios-vendor-sdks, this is minor

      - framework: {{this}}
        embed: false{{/each}}{{#if ios-vendor-frameworks}}{{~#each ios-vendor-frameworks}}
      - framework: {{this}}{{/each}}{{/if}}{{#if ios-vendor-sdks}}{{~#each ios-vendor-sdks}}
      - sdk: {{prefix-path this}}{{/each}}{{/if}}
      - sdk: CoreGraphics.framework
      - sdk: Metal.framework
      - sdk: MetalKit.framework
      - sdk: QuartzCore.framework
      - sdk: Security.framework
      - sdk: UIKit.framework{{#if this.ios-frameworks}}{{~#each ios-frameworks}}
      - sdk: {{this}}.framework{{/each}}{{/if}}
      - sdk: WebKit.framework

Copy link
Member Author

Choose a reason for hiding this comment

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

nice catch, thank you! pushed your fix

@mrguiman
Copy link
Contributor

CI - cli fails should be an issue of time-rs. It seemed to resolve the issue in 0.3.36

Just proposed #10407 to fix this issue

- sdk: CoreGraphics.framework
- sdk: Metal.framework
- sdk: Metal.frameworks
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it framework or frameworks 👀

Copy link
Member Author

Choose a reason for hiding this comment

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

I have no idea how i added this 😂 thanks

@mrguiman
Copy link
Contributor

This was also drafted in #9992

@lucasfernog lucasfernog merged commit a5bfbaa into dev Aug 2, 2024
29 checks passed
@lucasfernog lucasfernog deleted the feat/ios-frameworks branch August 2, 2024 10:35
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