fix(core): bump Pigeon to v25.3.2 (#17438)

* fix(core): bump Pigeon to v25.3.2 * fix: header should be available for SPM/cocoapods * chore: update to new naming types * chore(ios): update naming to match pigeon messages * chore: update to iOS 13 min * chore: move android over to latest Pigeon API * chore: update windows types to match latest * chore: update macOS version * apple example config * format * format * chore: fix unit test types * chore: update response from initializeCore * chore: rm unneeded check from response

Author: russellwheatley

packages/firebase_ai/firebase_ai/test/mock.dart

@@ -20,23 +20,23 @@ import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 class MockFirebaseAppVertexAI implements TestFirebaseCoreHostApi {
  @override
- Future<PigeonInitializeResponse> initializeApp(
+ Future<CoreInitializeResponse> initializeApp(
  String appName,
- PigeonFirebaseOptions initializeAppRequest,
+ CoreFirebaseOptions initializeAppRequest,
  ) async {
- return PigeonInitializeResponse(
+ return CoreInitializeResponse(
  name: appName,
  options: initializeAppRequest,
  pluginConstants: {},
  );
  }
 
  @override
- Future<List<PigeonInitializeResponse?>> initializeCore() async {
+ Future<List<CoreInitializeResponse>> initializeCore() async {
  return [
- PigeonInitializeResponse(
+ CoreInitializeResponse(
  name: defaultFirebaseAppName,
- options: PigeonFirebaseOptions(
+ options: CoreFirebaseOptions(
  apiKey: '123',
  projectId: '123',
  appId: '123',
@@ -48,8 +48,8 @@ class MockFirebaseAppVertexAI implements TestFirebaseCoreHostApi {
  }
 
  @override
- Future<PigeonFirebaseOptions> optionsFromResource() async {
- return PigeonFirebaseOptions(
+ Future<CoreFirebaseOptions> optionsFromResource() async {
+ return CoreFirebaseOptions(
  apiKey: '123',
  projectId: '123',
  appId: '123',
@@ -61,7 +61,7 @@ class MockFirebaseAppVertexAI implements TestFirebaseCoreHostApi {
 void setupFirebaseVertexAIMocks() {
  TestWidgetsFlutterBinding.ensureInitialized();
 
- TestFirebaseCoreHostApi.setup(MockFirebaseAppVertexAI());
+ TestFirebaseCoreHostApi.setUp(MockFirebaseAppVertexAI());
 }
 
 // FirebaseVertexAIPlatform Mock

packages/firebase_core/firebase_core/android/src/main/java/io/flutter/plugins/firebase/core/FlutterFirebaseCorePlugin.java

@@ -35,22 +35,22 @@ public class FlutterFirebaseCorePlugin
 
  @Override
  public void onAttachedToEngine(FlutterPluginBinding binding) {
- GeneratedAndroidFirebaseCore.FirebaseCoreHostApi.setup(binding.getBinaryMessenger(), this);
- GeneratedAndroidFirebaseCore.FirebaseAppHostApi.setup(binding.getBinaryMessenger(), this);
+ GeneratedAndroidFirebaseCore.FirebaseCoreHostApi.setUp(binding.getBinaryMessenger(), this);
+ GeneratedAndroidFirebaseCore.FirebaseAppHostApi.setUp(binding.getBinaryMessenger(), this);
  applicationContext = binding.getApplicationContext();
  }
 
  @Override
  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
  applicationContext = null;
- GeneratedAndroidFirebaseCore.FirebaseCoreHostApi.setup(binding.getBinaryMessenger(), null);
- GeneratedAndroidFirebaseCore.FirebaseAppHostApi.setup(binding.getBinaryMessenger(), null);
+ GeneratedAndroidFirebaseCore.FirebaseCoreHostApi.setUp(binding.getBinaryMessenger(), null);
+ GeneratedAndroidFirebaseCore.FirebaseAppHostApi.setUp(binding.getBinaryMessenger(), null);
  }
 
- private GeneratedAndroidFirebaseCore.PigeonFirebaseOptions firebaseOptionsToMap(
+ private GeneratedAndroidFirebaseCore.CoreFirebaseOptions firebaseOptionsToMap(
  FirebaseOptions options) {
- GeneratedAndroidFirebaseCore.PigeonFirebaseOptions.Builder firebaseOptions =
- new GeneratedAndroidFirebaseCore.PigeonFirebaseOptions.Builder();
+ GeneratedAndroidFirebaseCore.CoreFirebaseOptions.Builder firebaseOptions =
+ new GeneratedAndroidFirebaseCore.CoreFirebaseOptions.Builder();
 
  firebaseOptions.setApiKey(options.getApiKey());
  firebaseOptions.setAppId(options.getApplicationId());
@@ -67,16 +67,16 @@ private GeneratedAndroidFirebaseCore.PigeonFirebaseOptions firebaseOptionsToMap(
  return firebaseOptions.build();
  }
 
- private Task<GeneratedAndroidFirebaseCore.PigeonInitializeResponse> firebaseAppToMap(
+ private Task<GeneratedAndroidFirebaseCore.CoreInitializeResponse> firebaseAppToMap(
  FirebaseApp firebaseApp) {
- TaskCompletionSource<GeneratedAndroidFirebaseCore.PigeonInitializeResponse>
- taskCompletionSource = new TaskCompletionSource<>();
+ TaskCompletionSource<GeneratedAndroidFirebaseCore.CoreInitializeResponse> taskCompletionSource =
+ new TaskCompletionSource<>();
 
  cachedThreadPool.execute(
  () -> {
  try {
- GeneratedAndroidFirebaseCore.PigeonInitializeResponse.Builder initializeResponse =
- new GeneratedAndroidFirebaseCore.PigeonInitializeResponse.Builder();
+ GeneratedAndroidFirebaseCore.CoreInitializeResponse.Builder initializeResponse =
+ new GeneratedAndroidFirebaseCore.CoreInitializeResponse.Builder();
 
  initializeResponse.setName(firebaseApp.getName());
  initializeResponse.setOptions(firebaseOptionsToMap(firebaseApp.getOptions()));
@@ -111,14 +111,30 @@ private <T> void listenToResponse(
  });
  }
 
+ private void listenToVoidResponse(
+ TaskCompletionSource<Void> taskCompletionSource,
+ GeneratedAndroidFirebaseCore.VoidResult result) {
+ taskCompletionSource
+ .getTask()
+ .addOnCompleteListener(
+ task -> {
+ if (task.isSuccessful()) {
+ result.success();
+ } else {
+ Exception exception = task.getException();
+ result.error(exception);
+ }
+ });
+ }
+
  @Override
  public void initializeApp(
  @NonNull String appName,
- @NonNull GeneratedAndroidFirebaseCore.PigeonFirebaseOptions initializeAppRequest,
- GeneratedAndroidFirebaseCore.Result<GeneratedAndroidFirebaseCore.PigeonInitializeResponse>
+ @NonNull GeneratedAndroidFirebaseCore.CoreFirebaseOptions initializeAppRequest,
+ GeneratedAndroidFirebaseCore.Result<GeneratedAndroidFirebaseCore.CoreInitializeResponse>
  result) {
- TaskCompletionSource<GeneratedAndroidFirebaseCore.PigeonInitializeResponse>
- taskCompletionSource = new TaskCompletionSource<>();
+ TaskCompletionSource<GeneratedAndroidFirebaseCore.CoreInitializeResponse> taskCompletionSource =
+ new TaskCompletionSource<>();
 
  cachedThreadPool.execute(
  () -> {
@@ -160,10 +176,9 @@ public void initializeApp(
 
  @Override
  public void initializeCore(
- GeneratedAndroidFirebaseCore.Result<
- List<GeneratedAndroidFirebaseCore.PigeonInitializeResponse>>
+ GeneratedAndroidFirebaseCore.Result<List<GeneratedAndroidFirebaseCore.CoreInitializeResponse>>
  result) {
- TaskCompletionSource<List<GeneratedAndroidFirebaseCore.PigeonInitializeResponse>>
+ TaskCompletionSource<List<GeneratedAndroidFirebaseCore.CoreInitializeResponse>>
  taskCompletionSource = new TaskCompletionSource<>();
 
  cachedThreadPool.execute(
@@ -176,7 +191,7 @@ public void initializeCore(
  }
 
  List<FirebaseApp> firebaseApps = FirebaseApp.getApps(applicationContext);
- List<GeneratedAndroidFirebaseCore.PigeonInitializeResponse> firebaseAppsList =
+ List<GeneratedAndroidFirebaseCore.CoreInitializeResponse> firebaseAppsList =
  new ArrayList<>(firebaseApps.size());
 
  for (FirebaseApp firebaseApp : firebaseApps) {
@@ -194,9 +209,9 @@ public void initializeCore(
 
  @Override
  public void optionsFromResource(
- GeneratedAndroidFirebaseCore.Result<GeneratedAndroidFirebaseCore.PigeonFirebaseOptions>
+ GeneratedAndroidFirebaseCore.Result<GeneratedAndroidFirebaseCore.CoreFirebaseOptions>
  result) {
- TaskCompletionSource<GeneratedAndroidFirebaseCore.PigeonFirebaseOptions> taskCompletionSource =
+ TaskCompletionSource<GeneratedAndroidFirebaseCore.CoreFirebaseOptions> taskCompletionSource =
  new TaskCompletionSource<>();
 
  cachedThreadPool.execute(
@@ -222,7 +237,7 @@ public void optionsFromResource(
  public void setAutomaticDataCollectionEnabled(
  @NonNull String appName,
  @NonNull Boolean enabled,
- GeneratedAndroidFirebaseCore.Result<Void> result) {
+ GeneratedAndroidFirebaseCore.VoidResult result) {
  TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
 
  cachedThreadPool.execute(
@@ -237,14 +252,14 @@ public void setAutomaticDataCollectionEnabled(
  }
  });
 
- listenToResponse(taskCompletionSource, result);
+ listenToVoidResponse(taskCompletionSource, result);
  }
 
  @Override
  public void setAutomaticResourceManagementEnabled(
  @NonNull String appName,
  @NonNull Boolean enabled,
- GeneratedAndroidFirebaseCore.Result<Void> result) {
+ GeneratedAndroidFirebaseCore.VoidResult result) {
  TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
 
  cachedThreadPool.execute(
@@ -259,11 +274,11 @@ public void setAutomaticResourceManagementEnabled(
  }
  });
 
- listenToResponse(taskCompletionSource, result);
+ listenToVoidResponse(taskCompletionSource, result);
  }
 
  @Override
- public void delete(@NonNull String appName, GeneratedAndroidFirebaseCore.Result<Void> result) {
+ public void delete(@NonNull String appName, GeneratedAndroidFirebaseCore.VoidResult result) {
  TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
 
  cachedThreadPool.execute(
@@ -282,6 +297,6 @@ public void delete(@NonNull String appName, GeneratedAndroidFirebaseCore.Result<
  }
  });
 
- listenToResponse(taskCompletionSource, result);
+ listenToVoidResponse(taskCompletionSource, result);
  }
 }