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

Update release 0.12 branch to include #5285 and #5287 #5288

Merged
merged 2 commits into from
Dec 23, 2023
Merged

Update release 0.12 branch to include #5285 and #5287 #5288

merged 2 commits into from
Dec 23, 2023

Conversation

BenHenning
Copy link
Member

@BenHenning BenHenning commented Dec 23, 2023 •
edited
Loading

Explanation

This fixes #5284 for the upcoming 0.12 release by cherry-picking #5285 and #5287 into the release branch.

Both cherry-picks happened cleanly, so the review is expected to be straightforward. See the commits of this PR for specifics.

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

See corresponding cherry-picks and original PRs for references on what reverted behavior is being checked in within this PR.

BenHenning and others added 2 commits December 23, 2023 01:14
@BenHenning
Fix part of #5284: Revert "Fix #5266: Call setUpDrawer( ) directly if…
1f465cf 
… binding already initialized" (#5285)

Fixes part of #5284

Reverts #5276 as part of preparing to revert #5191.

Note that this reintroduces #5266 but that should stay fixed once #5191
is reverted.
@adhiamboperes @BenHenning
Fix #5284: Revert "Fix: #5186: MissingDefaultResource + AppCompatCust…
cf3fc36 
…omView + FragmentTagUsage" (#5287)

Fix #5284: Reverts #5191. See issue for details.

This should be a clean revert.
@BenHenning BenHenning changed the base branch from develop to release-0.12 December 23, 2023 09:18
@BenHenning
Copy link
Member Author

@adhiamboperes PTAL.

@BenHenning BenHenning marked this pull request as ready for review December 23, 2023 09:20
@BenHenning BenHenning requested review from a team as code owners December 23, 2023 09:20
@BenHenning BenHenning enabled auto-merge (squash) December 23, 2023 09:20
adhiamboperes
adhiamboperes approved these changes Dec 23, 2023
View reviewed changes
Copy link
Collaborator

@adhiamboperes adhiamboperes left a comment

Choose a reason for hiding this comment

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

Thanks @BenHenning, LGTM!

@oppiabot OppiaBot
Copy link

oppiabot bot commented Dec 23, 2023

Unassigning @adhiamboperes since they have already approved the PR.

@oppiabot oppiabot bot added the PR: LGTM label Dec 23, 2023
@oppiabot OppiaBot
Copy link

oppiabot bot commented Dec 23, 2023

Hi @BenHenning, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks!

@BenHenning BenHenning merged commit 01f4111 into release-0.12 Dec 23, 2023
26 checks passed
@BenHenning BenHenning deleted the update-release-0.12-branch branch December 23, 2023 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adhiamboperes adhiamboperes adhiamboperes approved these changes

Assignees

@BenHenning BenHenning

Labels
PR: LGTM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG]: App crashes in production builds
2 participants
@BenHenning @adhiamboperes