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

Clean up runtime OS version check #1480

Merged
merged 1 commit into from
Jul 31, 2023
Merged

Conversation

ichan-mb
Copy link
Member

Since we are raising the minimum OS requirement for Andriod to API level 19 (fuse-open/uno#504) and iOS to iOS 11 (fuse-open/uno#476) This will clean up some unnecessary runtime OS version check

This PR contains:

  • Changelog
  • Documentation
  • Tests

@mortend
Copy link
Member

mortend commented Jul 30, 2023

Nice clean up! I approve :)

Though, right now I think the beta-3.0 branch might be a better target for changes like this. Planning to make at least one more 2.x release from master and can't be too paranoid about unintended side effects when removing old code, so feeling better about doing clean-ups like this on a major version.

This branch seems straight-forward to rebase on beta-3.0:

# Add upstream remote (just for reference; you have probably done this already)
git remote add upstream https://github.com/fuse-open/fuselibs.git
# Fetch and rebase
git fetch upstream
git rebase upstream/beta-3.0

Sometimes when things don't rebase nicely (many conflicts or messy history/unwanted commits), it's better to rebase manually:

# Create a backup branch just in case
git branch backup -f

# Fetch and reset local branch to base branch
git fetch upstream
git reset --hard upstream/beta-3.0

# Look up wanted commit SHA(s) in log and cherry-pick
git log backup
git cherry-pick dba34f6b0796b930b42e29d14ca1569584a0ce81

# Force push 😎
git push -f

Also need to edit the GitHub PR to set base: beta-3.0 and personally I like to add (beta-3.0) in the title for reference.

@ichan-mb ichan-mb changed the base branch from master to beta-3.0 July 31, 2023 14:50
@ichan-mb
Copy link
Member Author

Thank you for your detailed steps, and I've made the changes as per your instructions

@ichan-mb ichan-mb requested a review from mortend July 31, 2023 14:53
@mortend mortend merged commit 5d34567 into fuse-open:beta-3.0 Jul 31, 2023
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.

2 participants