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.

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

Jump to bottom

[extension_google_sign_in_as_googleapis_auth][google_maps_flutter_ios] Manual roll with fixes to example and skipping some native tests #7571

Merged
merged 14 commits into from
Sep 6, 2024
Merged

[extension_google_sign_in_as_googleapis_auth][google_maps_flutter_ios] Manual roll with fixes to example and skipping some native tests #7571

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6339d87
update examples
bparrishMines Sep 3, 2024
8de6287
Merge branch 'main' of github.com:flutter/packages into update_examples
bparrishMines Sep 3, 2024
1f46aec
undo specific changes
bparrishMines Sep 3, 2024
9ecfc12
raise jvm limit
bparrishMines Sep 3, 2024
83ef738
manual roll
bparrishMines Sep 3, 2024
bb8d313
Merge branch 'main' of github.com:flutter/packages into update_examples
bparrishMines Sep 3, 2024
bc6bd3d
Merge branch 'main' into update_examples
gmackall Sep 3, 2024
6039ea8
Merge branch 'main' of github.com:flutter/packages into update_examples
bparrishMines Sep 4, 2024
4d0e113
try manual roll
bparrishMines Sep 4, 2024
a4fe594
Merge branch 'update_examples' of github.com:bparrishMines/packages i…
bparrishMines Sep 4, 2024
39d73c4
skip tests and later flutter version
bparrishMines Sep 5, 2024
55ee1fd
skip the correct test
bparrishMines Sep 5, 2024
c3b0bc3
Merge branch 'main' of github.com:flutter/packages into update_examples
bparrishMines Sep 5, 2024
56f2b1d
check for macos
bparrishMines Sep 5, 2024
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 @@
b8f89f70bf4e8c304fc909b58e23f2358983bb41
b99322ef66e2ecb3b10021a710555c3104069e68
2 changes: 1 addition & 1 deletion packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
Copy link
Contributor

Choose a reason for hiding this comment

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

I recall there are actually 2 parameters you need to set here. Let me see if I can find an example.

Copy link
Contributor Author

@bparrishMines bparrishMines Sep 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I found the commit for this one I think: 0814a3b

Copy link
Contributor

Choose a reason for hiding this comment

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

https://github.com/flutter/flutter/blob/28a91243049938251c718afe678f8ca177ba8b3f/examples/layers/android/gradle.properties#L2

Copy link
Contributor Author

@bparrishMines bparrishMines Sep 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Hmm it builds locally but not on CI

Copy link
Member

@gmackall gmackall Sep 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Ok, this is the same issue as flutter/flutter#154489. It seems like upgrading the guava version in 6.1.25 of google_sign_in_android has caused some issues with our use of R8 (I verified that reverting back to using

implementation 'com.google.guava:guava:32.0.1-android'

makes this example app build successfully).

I think perhaps we should revert back to that guava version to unblock the roller (and also to unblock google_sign_in_android being broken on flutter's latest master), and then investigate what it will take to unblock that upgrade

Copy link
Member

Choose a reason for hiding this comment

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

Done, and updated branch

Copy link
Member

Choose a reason for hiding this comment

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

Looks like it builds successfully now!

org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
11 changes: 11 additions & 0 deletions ..._maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerUITests/GoogleMapsUITests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -46,6 +49,8 @@ - (void)setUp {
}

- (void)testUserInterface {
XCTSkipIf(skipFor154641);

XCUIApplication *app = self.app;
XCUIElement *userInteface = app.staticTexts[@"User interface"];
if (![userInteface waitForExistenceWithTimeout:kWaitTime]) {
Expand Down Expand Up @@ -77,6 +82,8 @@ - (void)testUserInterface {
}

- (void)testMapCoordinatesPage {
XCTSkipIf(skipFor154641);

XCUIApplication *app = self.app;
XCUIElement *mapCoordinates = app.staticTexts[@"Map coordinates"];
if (![mapCoordinates waitForExistenceWithTimeout:kWaitTime]) {
Expand Down Expand Up @@ -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]) {
Expand Down Expand Up @@ -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"];
Expand Down