From 56df73e3c54ce9ea88a382b71a4ac1562c11efe3 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:27:21 -0600 Subject: [PATCH] [extension_google_sign_in_as_googleapis_auth][google_maps_flutter_ios] Manual roll with fixes to example and skipping some native tests (#7571) It looks like https://github.com/flutter/packages/pull/7521 missed a few packages examples and they are now failing to compile on main. Some native tests have also began to fail consistently for `google_maps_flutter_ios`: https://github.com/flutter/flutter/issues/154641 Some legacy iOS `webview_flutter` tests were also failing: https://github.com/flutter/flutter/issues/154676 --- .ci/flutter_master.version | 2 +- .../example/android/build.gradle | 2 +- .../example/android/gradle.properties | 2 +- .../ios14/ios/RunnerUITests/GoogleMapsUITests.m | 11 +++++++++++ .../integration_test/legacy/webview_flutter_test.dart | 8 ++++++-- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 26e27846f01a5..486be97789d25 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -b8f89f70bf4e8c304fc909b58e23f2358983bb41 +45ef8f36ff417550b1bd80dfb2add356be1bb8d1 diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle b/packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle index adcf257044675..92088245cb0e0 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.5.2' classpath 'com.google.gms:google-services:4.3.15' } } diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties index 94adc3a3f97aa..598d13fee4463 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerUITests/GoogleMapsUITests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerUITests/GoogleMapsUITests.m index 3a1191bdb39ec..cfb509a3c7444 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerUITests/GoogleMapsUITests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerUITests/GoogleMapsUITests.m @@ -8,6 +8,9 @@ static const NSTimeInterval kWaitTime = 60; +// TODO(bparrishMines): Remove once https://github.com/flutter/flutter/issues/154641 is fixed. +static const BOOL skipFor154641 = YES; + @interface GoogleMapsUITests : XCTestCase @property(nonatomic, strong) XCUIApplication *app; @end @@ -46,6 +49,8 @@ - (void)setUp { } - (void)testUserInterface { + XCTSkipIf(skipFor154641); + XCUIApplication *app = self.app; XCUIElement *userInteface = app.staticTexts[@"User interface"]; if (![userInteface waitForExistenceWithTimeout:kWaitTime]) { @@ -77,6 +82,8 @@ - (void)testUserInterface { } - (void)testMapCoordinatesPage { + XCTSkipIf(skipFor154641); + XCUIApplication *app = self.app; XCUIElement *mapCoordinates = app.staticTexts[@"Map coordinates"]; if (![mapCoordinates waitForExistenceWithTimeout:kWaitTime]) { @@ -168,6 +175,8 @@ - (void)validateVisibleRegion:(NSString *)label } - (void)testMapClickPage { + XCTSkipIf(skipFor154641); + XCUIApplication *app = self.app; XCUIElement *mapClick = app.staticTexts[@"Map click"]; if (![mapClick waitForExistenceWithTimeout:kWaitTime]) { @@ -212,6 +221,8 @@ - (void)forceTap:(XCUIElement *)button { } - (void)testMarkerDraggingCallbacks { + XCTSkipIf(skipFor154641); + XCUIApplication *application = [[XCUIApplication alloc] init]; [application launch]; XCUIElement *placeMarkerButton = application.staticTexts[@"Place marker"]; diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart index 8b2ef7143f32d..4ddecc87e4e11 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart @@ -22,6 +22,10 @@ import 'package:webview_flutter_wkwebview_example/legacy/navigation_decision.dar import 'package:webview_flutter_wkwebview_example/legacy/navigation_request.dart'; import 'package:webview_flutter_wkwebview_example/legacy/web_view.dart'; +// TODO(bparrishMines): Remove once https://github.com/flutter/flutter/issues/154676 +// is fixed. +const bool skipOnIosFor154676 = true; + Future main() async { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); @@ -537,7 +541,7 @@ Future main() async { final String fullScreen = await controller.runJavascriptReturningResult('isFullScreen();'); expect(fullScreen, _webviewBool(false)); - }); + }, skip: Platform.isMacOS || skipOnIosFor154676); testWidgets( 'Video plays full screen when allowsInlineMediaPlayback is false', @@ -587,7 +591,7 @@ Future main() async { final String fullScreen = await controller.runJavascriptReturningResult('isFullScreen();'); expect(fullScreen, _webviewBool(true)); - }); + }, skip: Platform.isMacOS || skipOnIosFor154676); }, // allowsInlineMediaPlayback has no effect on macOS. skip: Platform.isMacOS);