Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Reland "ios: remove shared_application and support app extension build #44732" #45351

Merged

Conversation

cyanglaz
Copy link
Contributor

@cyanglaz cyanglaz commented Aug 31, 2023

Relands #44732 with fix.

The original PR returns nil when the assets is not reachable, in some cases, the assets are not loaded yet but will be loaded later, so we should return the asset URL regardless.

Also added a fallback to main bundle to match the previous implementation.

The original PR was failed in internal tests in b/297654739
Now with the fix, all tests passed: cl/561449914

fixes flutter/flutter#124289

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

…port app extension build" (flutter#45250)"

This reverts commit 367c709.

fix

format

tests

format
@cyanglaz cyanglaz force-pushed the reland_remove_shared_application branch from d4ecab7 to 4a1709a Compare August 31, 2023 22:58
}
// Fallback to slow implementation.
return [NSBundle bundleWithIdentifier:bundleID];
return assets;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the fix, original PR had a url reachability test and returns nil here

return flutterFrameworkBundle;
}

NSString* FLTAssetPath(NSBundle* bundle) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Compares to the original PR, also refactored this method in this PR

XCTAssertEqualObjects(bundle.bundleURL, [NSBundle mainBundle].bundleURL);
}

- (void)testFLTAssetsURLFromBundle {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the test for the fix

Copy link
Contributor

@stuartmorgan-g stuartmorgan-g left a comment

Choose a reason for hiding this comment

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

LGTM

(For future reland-with-fix PRs, something that I highly recommend is to make the PR contain two commits, one that's a straight revert-of-revert, and then a second that's the changes, so that reviewers can easily review the diff from the previous version.)

@cyanglaz cyanglaz added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 1, 2023
@auto-submit auto-submit bot merged commit 9446392 into flutter:main Sep 1, 2023
@cyanglaz cyanglaz deleted the reland_remove_shared_application branch September 1, 2023 17:09
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 1, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 1, 2023
fluttermirroringbot pushed a commit to flutter/flutter that referenced this pull request Sep 2, 2023
…133879)

flutter/engine@d00b69a...489c399

2023-09-01 matanlurey@users.noreply.github.com Update (flipping the default from false -> true) and deprecate Paint.enableDithering. (flutter/engine#44705)
2023-09-01 jonahwilliams@google.com [Impeller] EntityPass::Clone needs to clone harder (flutter/engine#45313)
2023-09-01 ychris@google.com Reland "ios: remove shared_application and support app extension build #44732" (flutter/engine#45351)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC aaclarke@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
LinXunFeng added a commit to LinXunFeng/engine that referenced this pull request Nov 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects: desktop autosubmit Merge PR when tree becomes green via auto submit App platform-ios platform-macos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[app_extension_safe] Make iOS embedder extension safe when extension_safe build flag is true
2 participants