fix(core, apple): remove usage of deprecated options trackingID and androidClientID (#11893)

* fix(core, apple): remove usage of deprecated options trackingID and androidClientID

* fix(core, apple): remove usage of deprecated options trackingID and androidClientID

* update tests

* tests

Author: Lyokone

packages/firebase_core/firebase_core/example/android/build.gradle

@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

packages/firebase_core/firebase_core/example/ios/Runner.xcodeproj/project.pbxproj

@@ -166,7 +166,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "The Chromium Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

packages/firebase_core/firebase_core/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

packages/firebase_core/firebase_core/example/ios/Runner/Info.plist

@@ -43,5 +43,7 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

packages/firebase_core/firebase_core/ios/Classes/FLTFirebaseCorePlugin.m

@@ -61,9 +61,7 @@ - (PigeonFirebaseOptions *)optionsFromFIROptions:(FIROptions *)options {
   pigeonOptions.projectId = (id)options.projectID ?: [NSNull null];
   pigeonOptions.databaseURL = (id)options.databaseURL ?: [NSNull null];
   pigeonOptions.storageBucket = (id)options.storageBucket ?: [NSNull null];
-  pigeonOptions.trackingId = (id)options.trackingID ?: [NSNull null];
   pigeonOptions.deepLinkURLScheme = (id)options.deepLinkURLScheme ?: [NSNull null];
-  pigeonOptions.androidClientId = (id)options.androidClientID ?: [NSNull null];
   pigeonOptions.iosBundleId = (id)options.bundleID ?: [NSNull null];
   pigeonOptions.iosClientId = (id)options.clientID ?: [NSNull null];
   pigeonOptions.appGroupId = (id)options.appGroupID ?: [NSNull null];
@@ -137,21 +135,11 @@ - (void)initializeAppAppName:(nonnull NSString *)appName
     options.storageBucket = initializeAppRequest.storageBucket;
   }
 
-  // kFirebaseOptionsTrackingId
-  if (![initializeAppRequest.trackingId isEqual:[NSNull null]]) {
-    options.trackingID = initializeAppRequest.trackingId;
-  }
-
   // kFirebaseOptionsDeepLinkURLScheme
   if (![initializeAppRequest.deepLinkURLScheme isEqual:[NSNull null]]) {
     options.deepLinkURLScheme = initializeAppRequest.deepLinkURLScheme;
   }
 
-  // kFirebaseOptionsAndroidClientId
-  if (![initializeAppRequest.androidClientId isEqual:[NSNull null]]) {
-    options.androidClientID = initializeAppRequest.androidClientId;
-  }
-
   // kFirebaseOptionsIosBundleId
   if (![initializeAppRequest.iosBundleId isEqual:[NSNull null]]) {
     options.bundleID = initializeAppRequest.iosBundleId;

tests/lib/firebase_options.dart

@@ -69,8 +69,6 @@ class DefaultFirebaseOptions {
     databaseURL:
         'https://flutterfire-e2e-tests-default-rtdb.europe-west1.firebasedatabase.app',
     storageBucket: 'flutterfire-e2e-tests.appspot.com',
-    androidClientId:
-        '406099696497-tvtvuiqogct1gs1s6lh114jeps7hpjm5.apps.googleusercontent.com',
     iosClientId:
         '406099696497-taeapvle10rf355ljcvq5dt134mkghmp.apps.googleusercontent.com',
     iosBundleId: 'io.flutter.plugins.firebase.tests',
@@ -84,8 +82,6 @@ class DefaultFirebaseOptions {
     databaseURL:
         'https://flutterfire-e2e-tests-default-rtdb.europe-west1.firebasedatabase.app',
     storageBucket: 'flutterfire-e2e-tests.appspot.com',
-    androidClientId:
-        '406099696497-tvtvuiqogct1gs1s6lh114jeps7hpjm5.apps.googleusercontent.com',
     iosClientId:
         '406099696497-taeapvle10rf355ljcvq5dt134mkghmp.apps.googleusercontent.com',
     iosBundleId: 'io.flutter.plugins.firebase.tests',