Skip to content

[many] More v1 embedding deletion that was missed in https://github.com/flutter/packages/pull/6494 #6923

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
auto-submit merged 15 commits into from
Jun 20, 2024
Merged

[many] More v1 embedding deletion that was missed in https://github.com/flutter/packages/pull/6494 #6923

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1330498
splashscreenuntilfirstframe xmls
Jun 13, 2024
2611aa0
purge v1 from GoogleSignIn and pray
Jun 13, 2024
0173fc3
fix google_sign_in_android native unit tests
Jun 17, 2024
ee5d986
Merge branch 'main' into more_v1_deletion
gmackall Jun 17, 2024
3da9900
changelog+pubspec for google_sign_in
Jun 17, 2024
f48013d
video_player registrar removal
Jun 17, 2024
e33a02c
video_player pubspec+changelog
Jun 17, 2024
53f8f88
espresso v1 embedding removal
Jun 17, 2024
656f5a0
pubspec+changelog for espresso
Jun 17, 2024
25ea3a4
IAP unit test v1 embedding use removal
Jun 17, 2024
d3abcc6
removal in image_picker android unit test
Jun 17, 2024
686bf33
format
Jun 17, 2024
36a4c68
remove unused deprecation suppression
Jun 18, 2024
85a591b
remove todo: this is in fact test code
Jun 18, 2024
95563bd
format
Jun 19, 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
Prev Previous commit
Next Next commit
format
  • Loading branch information
Gray Mackall committed Jun 17, 2024
commit 686bf3390fb9e6b8cdb0cdf101965b673af3d7ea
8 changes: 4 additions & 4 deletions ...presso/android/src/main/java/androidx/test/espresso/flutter/action/FlutterViewAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,10 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.annotation.Nonnull;
import okhttp3.OkHttpClient;
import org.hamcrest.Matcher;

import javax.annotation.Nonnull;

/**
* A {@code ViewAction} which performs an action on the given {@code FlutterView}.
*
Expand Down Expand Up @@ -103,7 +102,7 @@ public void perform(UiController uiController, View view) {
checkNotNull(view, "The Flutter View instance cannot be null.");
if (!(view instanceof FlutterView)) {
throw new FlutterProtocolException(
String.format("This is not a Flutter View instance [id: %d].", view.getId()));
String.format("This is not a Flutter View instance [id: %d].", view.getId()));
}
FlutterView flutterView = (FlutterView) view;
// There could be a gap between when the Flutter view is available in the view hierarchy and the
Expand Down Expand Up @@ -178,7 +177,8 @@ public T waitUntilCompleted(long timeout, TimeUnit unit)
return resultFuture.get(timeout, unit);
}

private static void loopUntilFlutterViewRendered(@Nonnull FlutterView flutterView, UiController uiController) {
private static void loopUntilFlutterViewRendered(
@Nonnull FlutterView flutterView, UiController uiController) {
FlutterViewRenderedIdlingResource idlingResource =
new FlutterViewRenderedIdlingResource(flutterView);
try {
Expand Down
6 changes: 2 additions & 4 deletions ...rc/main/java/androidx/test/espresso/flutter/internal/protocol/impl/DartVmServiceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
import static com.google.common.base.Strings.isNullOrEmpty;

import android.util.Log;

import io.flutter.embedding.android.FlutterView;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.dart.DartExecutor;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;

import javax.annotation.Nonnull;

/** Util class for dealing with Dart VM service protocols. */
Expand Down Expand Up @@ -78,8 +76,8 @@ public static DartExecutor getDartExecutor(@Nonnull FlutterView flutterView) {
FlutterEngine flutterEngine = flutterView.getAttachedFlutterEngine();
if (flutterEngine == null) {
throw new FlutterProtocolException(
String.format(
"No Flutter engine attached to the Flutter view [id: %d].", flutterView.getId()));
String.format(
"No Flutter engine attached to the Flutter view [id: %d].", flutterView.getId()));
}
return flutterEngine.getDartExecutor();
}
Expand Down
1 change: 0 additions & 1 deletion ...id/src/test/java/io/flutter/plugins/googlesignin/GoogleSignInLegacyMethodChannelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.google.android.gms.common.api.Scope;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.tasks.Task;

import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.MethodCall;
Expand Down
3 changes: 0 additions & 3 deletions ...gn_in_android/android/src/test/java/io/flutter/plugins/googlesignin/GoogleSignInTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
import com.google.android.gms.common.api.Scope;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.tasks.Task;

import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.PluginRegistry;
import io.flutter.plugins.googlesignin.Messages.FlutterError;
import io.flutter.plugins.googlesignin.Messages.InitParams;
import java.util.Collections;
Expand Down
1 change: 0 additions & 1 deletion ...droid/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.PluginRegistry;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down