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

Sync upstream #23

Merged
merged 29 commits into from
Aug 9, 2024
Merged

Sync upstream #23

merged 29 commits into from
Aug 9, 2024

Conversation

andredestro
Copy link

@andredestro andredestro commented Aug 8, 2024

Platforms affected

Motivation and Context

The OutSystems branch is very out of date to the upstream.
As the changes in the plugin for MABS 11 are breaking changes, it can be a good time to do this sync.

Description

Testing

Checklist

  • I've run the tests to see all new and existing tests pass
  • I added automated test coverage as appropriate for this change
  • Commit is prefixed with (platform) if this change only applies to one platform (e.g. (android))
  • If this Pull Request resolves an issue, I linked to the issue in the text above (and used the correct keyword to close issues using keywords)
  • I've updated the documentation if necessary

erisu and others added 26 commits December 1, 2021 11:55
@andredestro andredestro self-assigned this Aug 8, 2024
@andredestro andredestro changed the base branch from master to outsystems August 8, 2024 17:30
@andredestro andredestro marked this pull request as ready for review August 8, 2024 17:33
markemer
markemer previously approved these changes Aug 8, 2024
@markemer markemer self-requested a review August 8, 2024 17:46
@markemer
Copy link

markemer commented Aug 8, 2024

Wait this still has the macos-11 stuff in it - the android stuff looks better, though.

@markemer markemer dismissed their stale review August 8, 2024 17:47

MacOS 11 is still referenced

@markemer
Copy link

markemer commented Aug 8, 2024

Yeah, these commits appear to be missing: apache#271 - but they're merged upstream - hrm. Yeah, seems 4.0.0 is too old, we'll have to merge main. I think there are only three 3 PRs extra anyway.

Copy link

@markemer markemer left a comment

Choose a reason for hiding this comment

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

Yeah - we need to merge HEAD instead of 4.0.0, or cherry pick the new PRs to get CI to work.

@markemer markemer mentioned this pull request Aug 8, 2024
5 tasks
Copy link

@jcesarmobile jcesarmobile left a comment

Choose a reason for hiding this comment

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

ACTION_IS_OVERLAYS_WEB_VIEW and ACTION_GET_HEIGHT have been added to the switch statement, but they are not declared.

@andredestro andredestro force-pushed the misc/sync-upstream branch 2 times, most recently from ffa2dda to 077d26c Compare August 9, 2024 09:24
@andredestro andredestro force-pushed the misc/sync-upstream branch 3 times, most recently from 260e92c to e24f03b Compare August 9, 2024 10:09
@andredestro andredestro merged commit a132b6c into outsystems Aug 9, 2024
32 of 34 checks passed
@andredestro andredestro deleted the misc/sync-upstream branch August 9, 2024 15: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.

4 participants