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

resolve conflicts with main #235

Merged
merged 2 commits into from
Oct 26, 2023
Merged

resolve conflicts with main #235

merged 2 commits into from
Oct 26, 2023

Conversation

arthurpalves
Copy link
Member

What does this PR do

  • Resolve conflicts with main

Checklist:

  • I ran make validation locally with success
  • I have not introduced new bugs
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented on my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new errors

* FIX: Github Marketplace action not picking up the latest release automatically [#189]
* FIX: Calling variants setup on M1 mac uses M1 unsupported gems in Gemfile [#208]
* FIX: Variants setup on M1 mac does not automatically link variants.xcconfig to xcodeproject [#209]
* FIX: Some signing configurations not automatically set in Xcode 14 [#214]

* REFACTOR: Signing configuration is updated not only during `setup` but also during `switch` [#215]
* REFACTOR: Items in `variants.xcconfig` should be sorted alphabetically [#219]

* FEATURE: Ability to add a `postSwitch` command/script, both globally or variant specific [#221]
* FEATURE:  Add ability to override app name per variant [#216]
* FEATURE: Expose configuration keys as static variables in swift [#125]
 
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: romanhu-bb <[email protected]>
Co-authored-by: Aksay Pudukudi Kandhadai (BB) <[email protected]>
Co-authored-by: Divine Dube <[email protected]>
Co-authored-by: Nour Sandid <[email protected]>
Co-authored-by: noursandidb <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gabriel Minucci <[email protected]>
Co-authored-by: Alex Kuziaev <[email protected]>
@arthurpalves arthurpalves merged commit 13ea724 into develop Oct 26, 2023
4 of 5 checks passed
@arthurpalves arthurpalves deleted the merge-back-changes branch October 26, 2023 11:28
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.

1 participant