Skip to content

manual roll and fix #3903

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

Merged
tarrinneal merged 13 commits into from
May 5, 2023
Merged

manual roll and fix #3903

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4d0fe7b
extend missing method
tarrinneal May 1, 2023
0609662
manual roll
tarrinneal May 1, 2023
d5355a5
addMethod
tarrinneal May 1, 2023
8eaead8
new version
tarrinneal May 4, 2023
dec5043
Merge branch 'main' into rollerFixer
tarrinneal May 4, 2023
9d4494a
override
tarrinneal May 4, 2023
bb0ed60
fix in_app_purchase_android
bparrishMines May 4, 2023
cd5e9cf
fix stable
tarrinneal May 4, 2023
c29e52c
Merge branch 'rollerFixer' of github.com:tarrinneal/packages into rol…
tarrinneal May 4, 2023
bf7bbed
attempt to move up to latest roll
tarrinneal May 4, 2023
dc98240
Merge branch 'main' of github.com:flutter/packages into rollerFixer
tarrinneal May 4, 2023
e3d27a3
change to mock
tarrinneal May 5, 2023
7912757
format and override removal
tarrinneal May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
db6074ade4e4fde664e6258d671faf356e1b6e85
15386d9d17b39a60dacd3dae35aa6463b9aecfd4
5 changes: 5 additions & 0 deletions packages/camera/camera/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ dev_dependencies:

flutter:
uses-material-design: true

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/camera/camera/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,8 @@ dev_dependencies:
mockito: 5.4.0
plugin_platform_interface: ^2.0.0
video_player: ^2.0.0

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../flutter_plugin_android_lifecycle}}
6 changes: 6 additions & 0 deletions packages/camera/camera_android/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ flutter:
uses-material-design: true

# FOR TESTING ONLY. DO NOT MERGE.

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:

camera_android:
path: ../../../camera/camera_android
flutter_plugin_android_lifecycle:
path: ../../../flutter_plugin_android_lifecycle
5 changes: 5 additions & 0 deletions packages/camera/camera_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../flutter_plugin_android_lifecycle}}
8 changes: 8 additions & 0 deletions .../test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,13 @@ public void addOnSaveStateListener(
@Override
public void removeOnSaveStateListener(
@NonNull ActivityPluginBinding.OnSaveInstanceStateListener listener) {}

@Override
public void addOnWindowFocusChangedListener(
@NonNull PluginRegistry.WindowFocusChangedListener listener) {}

@Override
public void removeOnWindowFocusChangedListener(
@NonNull PluginRegistry.WindowFocusChangedListener listener) {}
}
}
5 changes: 5 additions & 0 deletions packages/flutter_plugin_android_lifecycle/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ dev_dependencies:

flutter:
uses-material-design: true

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,8 @@ flutter:
uses-material-design: true
assets:
- assets/

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ flutter:
uses-material-design: true
assets:
- assets/

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ dev_dependencies:
flutter_test:
sdk: flutter
plugin_platform_interface: ^2.0.0

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ flutter:
uses-material-design: true
assets:
- assets/

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ flutter:
uses-material-design: true
assets:
- assets/

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ flutter:
uses-material-design: true
assets:
- assets/

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions ...google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@ dependencies:

flutter:
uses-material-design: true

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/image_picker/image_picker/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@ dev_dependencies:

flutter:
uses-material-design: true

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/image_picker/image_picker_android/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@ dev_dependencies:

flutter:
uses-material-design: true

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/image_picker/image_picker_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ dev_dependencies:
sdk: flutter
mockito: 5.4.0
pigeon: ^9.1.0

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/local_auth/local_auth_android/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ dev_dependencies:

flutter:
uses-material-design: true

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../../flutter_plugin_android_lifecycle}}
5 changes: 5 additions & 0 deletions packages/local_auth/local_auth_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ dev_dependencies:
sdk: flutter
mockito: 5.4.0
pigeon: ^9.2.4

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{flutter_plugin_android_lifecycle: {path: ../../flutter_plugin_android_lifecycle}}