From 4d0fe7bfff783ef0f4ff434b6d6d5504df4a4508 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Mon, 1 May 2023 12:13:28 -0700 Subject: [PATCH 01/10] extend missing method --- .../engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java index 9a6bfb7da5b..da110665ac3 100644 --- a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java +++ b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java @@ -95,5 +95,9 @@ public void addOnSaveStateListener( @Override public void removeOnSaveStateListener( @NonNull ActivityPluginBinding.OnSaveInstanceStateListener listener) {} + + @Override + public void removeOnWindowFocusChangedListener( + @NonNull PluginRegistry.WindowFocusChangedListener listener) {} } } From 060966274e441d52968033c7f9e450aa60b7850d Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Mon, 1 May 2023 12:14:47 -0700 Subject: [PATCH 02/10] manual roll --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 7ad6ea50162..5f5993d531d 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -66fa4c5d301c5093cb4403b39e3d61f604b96d90 +db7196c52cf8ce7313dc61139f095d5d29615e48 From d5355a558670cf1061f7c9ebaf51b98a9fb5641c Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Mon, 1 May 2023 12:35:04 -0700 Subject: [PATCH 03/10] addMethod --- .../engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java index da110665ac3..1fae4515b52 100644 --- a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java +++ b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java @@ -96,6 +96,10 @@ public void addOnSaveStateListener( public void removeOnSaveStateListener( @NonNull ActivityPluginBinding.OnSaveInstanceStateListener listener) {} + @Override + public void addOnWindowFocusChangedListener( + @NonNull PluginRegistry.WindowFocusChangedListener listener) {} + @Override public void removeOnWindowFocusChangedListener( @NonNull PluginRegistry.WindowFocusChangedListener listener) {} From 8eaead8d984605d4134915419052db515cab11b3 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Wed, 3 May 2023 20:25:12 -0700 Subject: [PATCH 04/10] new version --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 5f5993d531d..4acaa9dba84 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -db7196c52cf8ce7313dc61139f095d5d29615e48 +15386d9d17b39a60dacd3dae35aa6463b9aecfd4 \ No newline at end of file From 9d4494a11df60066a1329cf2e627a80696201363 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Wed, 3 May 2023 23:21:19 -0700 Subject: [PATCH 05/10] override --- packages/camera/camera/example/pubspec.yaml | 5 +++++ packages/camera/camera/pubspec.yaml | 5 +++++ packages/camera/camera_android/example/pubspec.yaml | 6 ++++++ packages/camera/camera_android/pubspec.yaml | 5 +++++ .../flutter_plugin_android_lifecycle/example/pubspec.yaml | 5 +++++ .../google_maps_flutter/example/pubspec.yaml | 5 +++++ .../google_maps_flutter_android/example/pubspec.yaml | 5 +++++ .../google_maps_flutter_android/pubspec.yaml | 5 +++++ .../google_maps_flutter_ios/example/ios11/pubspec.yaml | 5 +++++ .../google_maps_flutter_ios/example/ios12/pubspec.yaml | 5 +++++ .../google_maps_flutter_ios/example/ios13/pubspec.yaml | 5 +++++ .../example/shared/maps_example_dart/pubspec.yaml | 5 +++++ packages/image_picker/image_picker/example/pubspec.yaml | 5 +++++ .../image_picker/image_picker_android/example/pubspec.yaml | 5 +++++ packages/image_picker/image_picker_android/pubspec.yaml | 5 +++++ packages/local_auth/local_auth_android/example/pubspec.yaml | 5 +++++ packages/local_auth/local_auth_android/pubspec.yaml | 5 +++++ 17 files changed, 86 insertions(+) diff --git a/packages/camera/camera/example/pubspec.yaml b/packages/camera/camera/example/pubspec.yaml index 41ed519cd17..3030d643436 100644 --- a/packages/camera/camera/example/pubspec.yaml +++ b/packages/camera/camera/example/pubspec.yaml @@ -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}} diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index 28648adbe69..40190669d82 100644 --- a/packages/camera/camera/pubspec.yaml +++ b/packages/camera/camera/pubspec.yaml @@ -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}} diff --git a/packages/camera/camera_android/example/pubspec.yaml b/packages/camera/camera_android/example/pubspec.yaml index 39f40663d10..81e305e333b 100644 --- a/packages/camera/camera_android/example/pubspec.yaml +++ b/packages/camera/camera_android/example/pubspec.yaml @@ -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 diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml index deef7ee6a7c..98bed2fda72 100644 --- a/packages/camera/camera_android/pubspec.yaml +++ b/packages/camera/camera_android/pubspec.yaml @@ -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}} diff --git a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml index abb0c2b9a6c..4c0384e9f8b 100644 --- a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml +++ b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml @@ -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}} diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index da09f88a355..b6392d0f5b0 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index 259462c1465..ff7cd23d174 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 931f70b1ccd..01e1c909b67 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml index f34109a26fd..9c756dcf11d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml @@ -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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml index f34109a26fd..9c756dcf11d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml @@ -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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml index f34109a26fd..9c756dcf11d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml @@ -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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml index 29640b926d8..cb8a83e72f9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml @@ -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}} diff --git a/packages/image_picker/image_picker/example/pubspec.yaml b/packages/image_picker/image_picker/example/pubspec.yaml index 6b38b56bbed..5d25b1b8376 100644 --- a/packages/image_picker/image_picker/example/pubspec.yaml +++ b/packages/image_picker/image_picker/example/pubspec.yaml @@ -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}} diff --git a/packages/image_picker/image_picker_android/example/pubspec.yaml b/packages/image_picker/image_picker_android/example/pubspec.yaml index 8921a37a67e..faf3b92af0b 100644 --- a/packages/image_picker/image_picker_android/example/pubspec.yaml +++ b/packages/image_picker/image_picker_android/example/pubspec.yaml @@ -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}} diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml index 2e8b6045a7d..c4905631b47 100755 --- a/packages/image_picker/image_picker_android/pubspec.yaml +++ b/packages/image_picker/image_picker_android/pubspec.yaml @@ -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}} diff --git a/packages/local_auth/local_auth_android/example/pubspec.yaml b/packages/local_auth/local_auth_android/example/pubspec.yaml index 9a202edade2..60b85f1ea04 100644 --- a/packages/local_auth/local_auth_android/example/pubspec.yaml +++ b/packages/local_auth/local_auth_android/example/pubspec.yaml @@ -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}} diff --git a/packages/local_auth/local_auth_android/pubspec.yaml b/packages/local_auth/local_auth_android/pubspec.yaml index af8e9689352..86e2d1c9774 100644 --- a/packages/local_auth/local_auth_android/pubspec.yaml +++ b/packages/local_auth/local_auth_android/pubspec.yaml @@ -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}} From bb0ed60cfe715d8b16f8eda295c446e0f33f91c6 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Thu, 4 May 2023 12:08:29 -0400 Subject: [PATCH 06/10] fix in_app_purchase_android --- .../billing_client_manager_test.dart | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/in_app_purchase/in_app_purchase_android/test/billing_client_wrappers/billing_client_manager_test.dart b/packages/in_app_purchase/in_app_purchase_android/test/billing_client_wrappers/billing_client_manager_test.dart index 1644885d78d..97f4640c7ee 100644 --- a/packages/in_app_purchase/in_app_purchase_android/test/billing_client_wrappers/billing_client_manager_test.dart +++ b/packages/in_app_purchase/in_app_purchase_android/test/billing_client_wrappers/billing_client_manager_test.dart @@ -51,25 +51,29 @@ void main() { expect(stubPlatform.countPreviousCalls(startConnectionCall), equals(1)); }); - test('waits for connection before executing the operations', () { - bool called1 = false; - bool called2 = false; + test('waits for connection before executing the operations', () async { + final Completer calledCompleter1 = Completer(); + final Completer calledCompleter2 = Completer(); manager.runWithClient((BillingClient _) async { - called1 = true; + calledCompleter1.complete(); return const BillingResultWrapper(responseCode: BillingResponse.ok); }); manager.runWithClientNonRetryable( - (BillingClient _) async => called2 = true, + (BillingClient _) async => calledCompleter2.complete(), ); - expect(called1, equals(false)); - expect(called2, equals(false)); + expect(calledCompleter1.isCompleted, equals(false)); + expect(calledCompleter1.isCompleted, equals(false)); connectedCompleter.complete(); - expect(called1, equals(true)); - expect(called2, equals(true)); + await expectLater(calledCompleter1.future, completes); + await expectLater(calledCompleter2.future, completes); }); - test('re-connects when client sends onBillingServiceDisconnected', () { + test('re-connects when client sends onBillingServiceDisconnected', + () async { connectedCompleter.complete(); + // Ensures all asynchronous connected code finishes. + await manager.runWithClientNonRetryable((_) async {}); + manager.client.callHandler( const MethodCall(onBillingServiceDisconnectedCallback, {'handle': 0}), From cd5e9cf7254c2eacb0d8824fdeba48032e46041f Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Thu, 4 May 2023 16:05:17 -0700 Subject: [PATCH 07/10] fix stable --- .../engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java index 1fae4515b52..fb595e1ef5e 100644 --- a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java +++ b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java @@ -96,11 +96,9 @@ public void addOnSaveStateListener( public void removeOnSaveStateListener( @NonNull ActivityPluginBinding.OnSaveInstanceStateListener listener) {} - @Override public void addOnWindowFocusChangedListener( @NonNull PluginRegistry.WindowFocusChangedListener listener) {} - @Override public void removeOnWindowFocusChangedListener( @NonNull PluginRegistry.WindowFocusChangedListener listener) {} } From bf7bbed2e8e9d4309bf5134bfeaa7c1b800d1898 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Thu, 4 May 2023 16:10:56 -0700 Subject: [PATCH 08/10] attempt to move up to latest roll --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index fe9ead85c0c..9c1bdfcd718 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -15386d9d17b39a60dacd3dae35aa6463b9aecfd4 +0b657236cae4c8f1c63cb3025aa9b92cf2795f74 \ No newline at end of file From e3d27a3e53798dc06614a651de7bb1965756341d Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Thu, 4 May 2023 17:18:30 -0700 Subject: [PATCH 09/10] change to mock --- .../FlutterLifecycleAdapterTest.java | 72 +++---------------- 1 file changed, 8 insertions(+), 64 deletions(-) diff --git a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java index fb595e1ef5e..da05d407933 100644 --- a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java +++ b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java @@ -16,9 +16,11 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import static org.mockito.Mockito.when; public class FlutterLifecycleAdapterTest { @Mock Lifecycle lifecycle; + @Mock ActivityPluginBinding mockActivityPluginBinding; AutoCloseable mockCloseable; @@ -34,72 +36,14 @@ public void tearDown() throws Exception { @Test public void getActivityLifecycle() { - TestActivityPluginBinding binding = new TestActivityPluginBinding(lifecycle); + when(mockActivityPluginBinding.getLifecycle()) + .thenReturn(new HiddenLifecycleReference(lifecycle)); - Lifecycle parsedLifecycle = FlutterLifecycleAdapter.getActivityLifecycle(binding); + when(mockActivityPluginBinding.getActivity()) + .thenReturn(null); - assertEquals(lifecycle, parsedLifecycle); - } - - private static final class TestActivityPluginBinding implements ActivityPluginBinding { - private final Lifecycle lifecycle; - - TestActivityPluginBinding(Lifecycle lifecycle) { - this.lifecycle = lifecycle; - } - - @NonNull - public Object getLifecycle() { - return new HiddenLifecycleReference(lifecycle); - } - - @Override - public Activity getActivity() { - return null; - } - - @Override - public void addRequestPermissionsResultListener( - @NonNull PluginRegistry.RequestPermissionsResultListener listener) {} - - @Override - public void removeRequestPermissionsResultListener( - @NonNull PluginRegistry.RequestPermissionsResultListener listener) {} - - @Override - public void addActivityResultListener( - @NonNull PluginRegistry.ActivityResultListener listener) {} + Lifecycle parsedLifecycle = FlutterLifecycleAdapter.getActivityLifecycle(mockActivityPluginBinding); - @Override - public void removeActivityResultListener( - @NonNull PluginRegistry.ActivityResultListener listener) {} - - @Override - public void addOnNewIntentListener(@NonNull PluginRegistry.NewIntentListener listener) {} - - @Override - public void removeOnNewIntentListener(@NonNull PluginRegistry.NewIntentListener listener) {} - - @Override - public void addOnUserLeaveHintListener( - @NonNull PluginRegistry.UserLeaveHintListener listener) {} - - @Override - public void removeOnUserLeaveHintListener( - @NonNull PluginRegistry.UserLeaveHintListener listener) {} - - @Override - public void addOnSaveStateListener( - @NonNull ActivityPluginBinding.OnSaveInstanceStateListener listener) {} - - @Override - public void removeOnSaveStateListener( - @NonNull ActivityPluginBinding.OnSaveInstanceStateListener listener) {} - - public void addOnWindowFocusChangedListener( - @NonNull PluginRegistry.WindowFocusChangedListener listener) {} - - public void removeOnWindowFocusChangedListener( - @NonNull PluginRegistry.WindowFocusChangedListener listener) {} + assertEquals(lifecycle, parsedLifecycle); } } From 79127571ad1d6a6ccfc6f9ef0ed065eda6165b24 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Thu, 4 May 2023 20:16:39 -0700 Subject: [PATCH 10/10] format and override removal --- packages/camera/camera/example/pubspec.yaml | 5 ----- packages/camera/camera/pubspec.yaml | 5 ----- packages/camera/camera_android/example/pubspec.yaml | 11 ----------- packages/camera/camera_android/pubspec.yaml | 5 ----- .../lifecycle/FlutterLifecycleAdapterTest.java | 11 ++++------- .../example/pubspec.yaml | 5 ----- .../google_maps_flutter/example/pubspec.yaml | 5 ----- .../google_maps_flutter_android/example/pubspec.yaml | 5 ----- .../google_maps_flutter_android/pubspec.yaml | 5 ----- .../example/ios11/pubspec.yaml | 5 ----- .../example/ios12/pubspec.yaml | 5 ----- .../example/ios13/pubspec.yaml | 5 ----- .../example/shared/maps_example_dart/pubspec.yaml | 5 ----- .../image_picker/image_picker/example/pubspec.yaml | 5 ----- .../image_picker_android/example/pubspec.yaml | 5 ----- .../image_picker/image_picker_android/pubspec.yaml | 5 ----- .../local_auth_android/example/pubspec.yaml | 5 ----- packages/local_auth/local_auth_android/pubspec.yaml | 5 ----- 18 files changed, 4 insertions(+), 98 deletions(-) diff --git a/packages/camera/camera/example/pubspec.yaml b/packages/camera/camera/example/pubspec.yaml index 3030d643436..41ed519cd17 100644 --- a/packages/camera/camera/example/pubspec.yaml +++ b/packages/camera/camera/example/pubspec.yaml @@ -30,8 +30,3 @@ 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}} diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index 40190669d82..28648adbe69 100644 --- a/packages/camera/camera/pubspec.yaml +++ b/packages/camera/camera/pubspec.yaml @@ -38,8 +38,3 @@ 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}} diff --git a/packages/camera/camera_android/example/pubspec.yaml b/packages/camera/camera_android/example/pubspec.yaml index 81e305e333b..98aa4a6d4f2 100644 --- a/packages/camera/camera_android/example/pubspec.yaml +++ b/packages/camera/camera_android/example/pubspec.yaml @@ -32,14 +32,3 @@ dev_dependencies: 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 diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml index 98bed2fda72..deef7ee6a7c 100644 --- a/packages/camera/camera_android/pubspec.yaml +++ b/packages/camera/camera_android/pubspec.yaml @@ -31,8 +31,3 @@ 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}} diff --git a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java index da05d407933..80bfc4ca562 100644 --- a/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java +++ b/packages/flutter_plugin_android_lifecycle/android/src/test/java/io/flutter/embedding/engine/plugins/lifecycle/FlutterLifecycleAdapterTest.java @@ -5,18 +5,15 @@ package io.flutter.embedding.engine.plugins.lifecycle; import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; -import android.app.Activity; -import androidx.annotation.NonNull; import androidx.lifecycle.Lifecycle; import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding; -import io.flutter.plugin.common.PluginRegistry; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import static org.mockito.Mockito.when; public class FlutterLifecycleAdapterTest { @Mock Lifecycle lifecycle; @@ -39,10 +36,10 @@ public void getActivityLifecycle() { when(mockActivityPluginBinding.getLifecycle()) .thenReturn(new HiddenLifecycleReference(lifecycle)); - when(mockActivityPluginBinding.getActivity()) - .thenReturn(null); + when(mockActivityPluginBinding.getActivity()).thenReturn(null); - Lifecycle parsedLifecycle = FlutterLifecycleAdapter.getActivityLifecycle(mockActivityPluginBinding); + Lifecycle parsedLifecycle = + FlutterLifecycleAdapter.getActivityLifecycle(mockActivityPluginBinding); assertEquals(lifecycle, parsedLifecycle); } diff --git a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml index 4c0384e9f8b..abb0c2b9a6c 100644 --- a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml +++ b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml @@ -25,8 +25,3 @@ 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}} diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index b6392d0f5b0..da09f88a355 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -35,8 +35,3 @@ 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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index ff7cd23d174..259462c1465 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -34,8 +34,3 @@ 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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 01e1c909b67..931f70b1ccd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -29,8 +29,3 @@ 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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml index 9c756dcf11d..f34109a26fd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios11/pubspec.yaml @@ -34,8 +34,3 @@ 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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml index 9c756dcf11d..f34109a26fd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/pubspec.yaml @@ -34,8 +34,3 @@ 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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml index 9c756dcf11d..f34109a26fd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/pubspec.yaml @@ -34,8 +34,3 @@ 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}} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml index cb8a83e72f9..29640b926d8 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml @@ -22,8 +22,3 @@ 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}} diff --git a/packages/image_picker/image_picker/example/pubspec.yaml b/packages/image_picker/image_picker/example/pubspec.yaml index 5d25b1b8376..6b38b56bbed 100644 --- a/packages/image_picker/image_picker/example/pubspec.yaml +++ b/packages/image_picker/image_picker/example/pubspec.yaml @@ -32,8 +32,3 @@ 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}} diff --git a/packages/image_picker/image_picker_android/example/pubspec.yaml b/packages/image_picker/image_picker_android/example/pubspec.yaml index faf3b92af0b..8921a37a67e 100644 --- a/packages/image_picker/image_picker_android/example/pubspec.yaml +++ b/packages/image_picker/image_picker_android/example/pubspec.yaml @@ -32,8 +32,3 @@ 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}} diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml index c4905631b47..2e8b6045a7d 100755 --- a/packages/image_picker/image_picker_android/pubspec.yaml +++ b/packages/image_picker/image_picker_android/pubspec.yaml @@ -29,8 +29,3 @@ 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}} diff --git a/packages/local_auth/local_auth_android/example/pubspec.yaml b/packages/local_auth/local_auth_android/example/pubspec.yaml index 60b85f1ea04..9a202edade2 100644 --- a/packages/local_auth/local_auth_android/example/pubspec.yaml +++ b/packages/local_auth/local_auth_android/example/pubspec.yaml @@ -28,8 +28,3 @@ 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}} diff --git a/packages/local_auth/local_auth_android/pubspec.yaml b/packages/local_auth/local_auth_android/pubspec.yaml index 86e2d1c9774..af8e9689352 100644 --- a/packages/local_auth/local_auth_android/pubspec.yaml +++ b/packages/local_auth/local_auth_android/pubspec.yaml @@ -30,8 +30,3 @@ 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}}