Skip to content

Commit c0e0c99

Browse files
LyokoneLyokone
authoredAug 9, 2024··
feat: bump iOS SDK to version 11.0.0 (#13158)
* feat: bump iOS SDK to version 11.0.0 * test * updates * with precompiled * update macos deployment * fix conditional type for macos * fix conditional * remove tests needing signin * fix tests
·
_flutterfire_internals-v1.3.543.6.0-firebase-core-swift
1 parent e3d600f commit c0e0c99

File tree

23 files changed

+905
-765
lines changed

23 files changed

+905
-765
lines changed
 

‎packages/cloud_firestore/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj

+18-18
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
9705A1C41CF9048500538489 /* Embed Frameworks */,
143143
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
144144
279EA8199A12C4F77765546D /* [CP] Embed Pods Frameworks */,
145-
E829DA429D0778BA644E7083 /* [CP] Copy Pods Resources */,
145+
11D71EC060D78E89744DA92E /* [CP] Copy Pods Resources */,
146146
);
147147
buildRules = (
148148
);
@@ -202,6 +202,23 @@
202202
/* End PBXResourcesBuildPhase section */
203203

204204
/* Begin PBXShellScriptBuildPhase section */
205+
11D71EC060D78E89744DA92E /* [CP] Copy Pods Resources */ = {
206+
isa = PBXShellScriptBuildPhase;
207+
buildActionMask = 2147483647;
208+
files = (
209+
);
210+
inputFileListPaths = (
211+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
212+
);
213+
name = "[CP] Copy Pods Resources";
214+
outputFileListPaths = (
215+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
216+
);
217+
runOnlyForDeploymentPostprocessing = 0;
218+
shellPath = /bin/sh;
219+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
220+
showEnvVarsInLog = 0;
221+
};
205222
279EA8199A12C4F77765546D /* [CP] Embed Pods Frameworks */ = {
206223
isa = PBXShellScriptBuildPhase;
207224
buildActionMask = 2147483647;
@@ -272,23 +289,6 @@
272289
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
273290
showEnvVarsInLog = 0;
274291
};
275-
E829DA429D0778BA644E7083 /* [CP] Copy Pods Resources */ = {
276-
isa = PBXShellScriptBuildPhase;
277-
buildActionMask = 2147483647;
278-
files = (
279-
);
280-
inputFileListPaths = (
281-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
282-
);
283-
name = "[CP] Copy Pods Resources";
284-
outputFileListPaths = (
285-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
286-
);
287-
runOnlyForDeploymentPostprocessing = 0;
288-
shellPath = /bin/sh;
289-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
290-
showEnvVarsInLog = 0;
291-
};
292292
/* End PBXShellScriptBuildPhase section */
293293

294294
/* Begin PBXSourcesBuildPhase section */

‎packages/cloud_firestore/cloud_firestore/example/ios/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎packages/cloud_firestore/cloud_firestore/example/macos/Runner.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
33CC110E2044A8840003C045 /* Bundle Framework */,
233233
3399D490228B24CF009A79C7 /* ShellScript */,
234234
2EF7CB7C80601312BBC015DF /* [CP] Embed Pods Frameworks */,
235-
FFFD5E769E35BE853F590842 /* [CP] Copy Pods Resources */,
235+
43EA27CA4B0A80152846AE21 /* [CP] Copy Pods Resources */,
236236
);
237237
buildRules = (
238238
);
@@ -393,7 +393,7 @@
393393
shellPath = /bin/sh;
394394
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
395395
};
396-
FFFD5E769E35BE853F590842 /* [CP] Copy Pods Resources */ = {
396+
43EA27CA4B0A80152846AE21 /* [CP] Copy Pods Resources */ = {
397397
isa = PBXShellScriptBuildPhase;
398398
buildActionMask = 2147483647;
399399
files = (

‎packages/cloud_firestore/cloud_firestore/example/macos/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true

‎packages/cloud_functions/cloud_functions/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@
409409
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
410410
GCC_WARN_UNUSED_FUNCTION = YES;
411411
GCC_WARN_UNUSED_VARIABLE = YES;
412-
MACOSX_DEPLOYMENT_TARGET = 10.14;
412+
MACOSX_DEPLOYMENT_TARGET = 10.15;
413413
MTL_ENABLE_DEBUG_INFO = NO;
414414
SDKROOT = macosx;
415415
SWIFT_COMPILATION_MODE = wholemodule;
@@ -494,7 +494,7 @@
494494
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
495495
GCC_WARN_UNUSED_FUNCTION = YES;
496496
GCC_WARN_UNUSED_VARIABLE = YES;
497-
MACOSX_DEPLOYMENT_TARGET = 10.14;
497+
MACOSX_DEPLOYMENT_TARGET = 10.15;
498498
MTL_ENABLE_DEBUG_INFO = YES;
499499
ONLY_ACTIVE_ARCH = YES;
500500
SDKROOT = macosx;
@@ -541,7 +541,7 @@
541541
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
542542
GCC_WARN_UNUSED_FUNCTION = YES;
543543
GCC_WARN_UNUSED_VARIABLE = YES;
544-
MACOSX_DEPLOYMENT_TARGET = 10.14;
544+
MACOSX_DEPLOYMENT_TARGET = 10.15;
545545
MTL_ENABLE_DEBUG_INFO = NO;
546546
SDKROOT = macosx;
547547
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_analytics/firebase_analytics/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
409409
GCC_WARN_UNUSED_FUNCTION = YES;
410410
GCC_WARN_UNUSED_VARIABLE = YES;
411-
MACOSX_DEPLOYMENT_TARGET = 10.14;
411+
MACOSX_DEPLOYMENT_TARGET = 10.15;
412412
MTL_ENABLE_DEBUG_INFO = NO;
413413
SDKROOT = macosx;
414414
SWIFT_COMPILATION_MODE = wholemodule;
@@ -488,7 +488,7 @@
488488
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
489489
GCC_WARN_UNUSED_FUNCTION = YES;
490490
GCC_WARN_UNUSED_VARIABLE = YES;
491-
MACOSX_DEPLOYMENT_TARGET = 10.14;
491+
MACOSX_DEPLOYMENT_TARGET = 10.15;
492492
MTL_ENABLE_DEBUG_INFO = YES;
493493
ONLY_ACTIVE_ARCH = YES;
494494
SDKROOT = macosx;
@@ -535,7 +535,7 @@
535535
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
536536
GCC_WARN_UNUSED_FUNCTION = YES;
537537
GCC_WARN_UNUSED_VARIABLE = YES;
538-
MACOSX_DEPLOYMENT_TARGET = 10.14;
538+
MACOSX_DEPLOYMENT_TARGET = 10.15;
539539
MTL_ENABLE_DEBUG_INFO = NO;
540540
SDKROOT = macosx;
541541
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_app_installations/firebase_app_installations/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@
407407
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
408408
GCC_WARN_UNUSED_FUNCTION = YES;
409409
GCC_WARN_UNUSED_VARIABLE = YES;
410-
MACOSX_DEPLOYMENT_TARGET = 10.14;
410+
MACOSX_DEPLOYMENT_TARGET = 10.15;
411411
MTL_ENABLE_DEBUG_INFO = NO;
412412
SDKROOT = macosx;
413413
SWIFT_COMPILATION_MODE = wholemodule;
@@ -487,7 +487,7 @@
487487
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
488488
GCC_WARN_UNUSED_FUNCTION = YES;
489489
GCC_WARN_UNUSED_VARIABLE = YES;
490-
MACOSX_DEPLOYMENT_TARGET = 10.14;
490+
MACOSX_DEPLOYMENT_TARGET = 10.15;
491491
MTL_ENABLE_DEBUG_INFO = YES;
492492
ONLY_ACTIVE_ARCH = YES;
493493
SDKROOT = macosx;
@@ -534,7 +534,7 @@
534534
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
535535
GCC_WARN_UNUSED_FUNCTION = YES;
536536
GCC_WARN_UNUSED_VARIABLE = YES;
537-
MACOSX_DEPLOYMENT_TARGET = 10.14;
537+
MACOSX_DEPLOYMENT_TARGET = 10.15;
538538
MTL_ENABLE_DEBUG_INFO = NO;
539539
SDKROOT = macosx;
540540
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_auth/firebase_auth/example/macos/Runner.xcodeproj/project.pbxproj

+48-7
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
33CC110E2044A8840003C045 /* Bundle Framework */,
191191
3399D490228B24CF009A79C7 /* ShellScript */,
192192
E033F9E34514FF7F419D8FF5 /* [CP] Embed Pods Frameworks */,
193+
91D69FDB92A2BAB6493D7E50 /* [CP] Copy Pods Resources */,
193194
);
194195
buildRules = (
195196
);
@@ -208,7 +209,7 @@
208209
isa = PBXProject;
209210
attributes = {
210211
LastSwiftUpdateCheck = 0920;
211-
LastUpgradeCheck = 1300;
212+
LastUpgradeCheck = 1510;
212213
ORGANIZATIONNAME = "The Flutter Authors";
213214
TargetAttributes = {
214215
33CC10EC2044A3C60003C045 = {
@@ -299,6 +300,26 @@
299300
shellPath = /bin/sh;
300301
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n";
301302
};
303+
91D69FDB92A2BAB6493D7E50 /* [CP] Copy Pods Resources */ = {
304+
isa = PBXShellScriptBuildPhase;
305+
buildActionMask = 2147483647;
306+
files = (
307+
);
308+
inputPaths = (
309+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
310+
"${PODS_CONFIGURATION_BUILD_DIR}/firebase_messaging/firebase_messaging_Privacy.bundle",
311+
"${PODS_CONFIGURATION_BUILD_DIR}/google_sign_in_ios/google_sign_in_ios_privacy.bundle",
312+
);
313+
name = "[CP] Copy Pods Resources";
314+
outputPaths = (
315+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/firebase_messaging_Privacy.bundle",
316+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/google_sign_in_ios_privacy.bundle",
317+
);
318+
runOnlyForDeploymentPostprocessing = 0;
319+
shellPath = /bin/sh;
320+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
321+
showEnvVarsInLog = 0;
322+
};
302323
9C4FABD4FD7B8936CFFEAF31 /* [CP] Check Pods Manifest.lock */ = {
303324
isa = PBXShellScriptBuildPhase;
304325
buildActionMask = 2147483647;
@@ -328,31 +349,51 @@
328349
);
329350
inputPaths = (
330351
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
352+
"${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework",
331353
"${BUILT_PRODUCTS_DIR}/FirebaseAppCheckInterop/FirebaseAppCheckInterop.framework",
332354
"${BUILT_PRODUCTS_DIR}/FirebaseAuth/FirebaseAuth.framework",
355+
"${BUILT_PRODUCTS_DIR}/FirebaseAuthInterop/FirebaseAuthInterop.framework",
333356
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
357+
"${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework",
334358
"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
335359
"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
336360
"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
361+
"${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework",
337362
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
338363
"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
364+
"${BUILT_PRODUCTS_DIR}/GoogleSignIn/GoogleSignIn.framework",
339365
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
340366
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
367+
"${BUILT_PRODUCTS_DIR}/facebook_auth_desktop/facebook_auth_desktop.framework",
368+
"${BUILT_PRODUCTS_DIR}/flutter_secure_storage_macos/flutter_secure_storage_macos.framework",
341369
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
370+
"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
371+
"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
372+
"${BUILT_PRODUCTS_DIR}/url_launcher_macos/url_launcher_macos.framework",
342373
);
343374
name = "[CP] Embed Pods Frameworks";
344375
outputPaths = (
376+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework",
345377
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAppCheckInterop.framework",
346378
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAuth.framework",
379+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAuthInterop.framework",
347380
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
381+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework",
348382
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
349383
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
350384
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
385+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework",
351386
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
352387
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
388+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleSignIn.framework",
353389
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
354390
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
391+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/facebook_auth_desktop.framework",
392+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage_macos.framework",
355393
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
394+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
395+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
396+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_macos.framework",
356397
);
357398
runOnlyForDeploymentPostprocessing = 0;
358399
shellPath = /bin/sh;
@@ -433,7 +474,7 @@
433474
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
434475
GCC_WARN_UNUSED_FUNCTION = YES;
435476
GCC_WARN_UNUSED_VARIABLE = YES;
436-
MACOSX_DEPLOYMENT_TARGET = 10.14;
477+
MACOSX_DEPLOYMENT_TARGET = 10.15;
437478
MTL_ENABLE_DEBUG_INFO = NO;
438479
SDKROOT = macosx;
439480
SWIFT_COMPILATION_MODE = wholemodule;
@@ -461,7 +502,7 @@
461502
"$(inherited)",
462503
"@executable_path/../Frameworks",
463504
);
464-
MACOSX_DEPLOYMENT_TARGET = 10.14;
505+
MACOSX_DEPLOYMENT_TARGET = 10.15;
465506
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.auth.example;
466507
PROVISIONING_PROFILE_SPECIFIER = "";
467508
SWIFT_VERSION = 5.0;
@@ -520,7 +561,7 @@
520561
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
521562
GCC_WARN_UNUSED_FUNCTION = YES;
522563
GCC_WARN_UNUSED_VARIABLE = YES;
523-
MACOSX_DEPLOYMENT_TARGET = 10.14;
564+
MACOSX_DEPLOYMENT_TARGET = 10.15;
524565
MTL_ENABLE_DEBUG_INFO = YES;
525566
ONLY_ACTIVE_ARCH = YES;
526567
SDKROOT = macosx;
@@ -567,7 +608,7 @@
567608
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
568609
GCC_WARN_UNUSED_FUNCTION = YES;
569610
GCC_WARN_UNUSED_VARIABLE = YES;
570-
MACOSX_DEPLOYMENT_TARGET = 10.14;
611+
MACOSX_DEPLOYMENT_TARGET = 10.15;
571612
MTL_ENABLE_DEBUG_INFO = NO;
572613
SDKROOT = macosx;
573614
SWIFT_COMPILATION_MODE = wholemodule;
@@ -595,7 +636,7 @@
595636
"$(inherited)",
596637
"@executable_path/../Frameworks",
597638
);
598-
MACOSX_DEPLOYMENT_TARGET = 10.14;
639+
MACOSX_DEPLOYMENT_TARGET = 10.15;
599640
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.auth.example;
600641
PROVISIONING_PROFILE_SPECIFIER = "";
601642
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -623,7 +664,7 @@
623664
"$(inherited)",
624665
"@executable_path/../Frameworks",
625666
);
626-
MACOSX_DEPLOYMENT_TARGET = 10.14;
667+
MACOSX_DEPLOYMENT_TARGET = 10.15;
627668
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.auth.example;
628669
PROVISIONING_PROFILE_SPECIFIER = "";
629670
SWIFT_VERSION = 5.0;

‎packages/firebase_auth/firebase_auth/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎packages/firebase_auth/firebase_auth/example/macos/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true

‎packages/firebase_auth/firebase_auth/ios/Classes/PigeonParser.m

+2
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,15 @@ + (PigeonAdditionalUserInfo *)getPigeonAdditionalUserInfo:(nonnull FIRAdditional
8080
profile:userInfo.profile];
8181
}
8282

83+
#if TARGET_OS_IPHONE
8384
+ (PigeonTotpSecret *)getPigeonTotpSecret:(FIRTOTPSecret *)secret {
8485
return [PigeonTotpSecret makeWithCodeIntervalSeconds:nil
8586
codeLength:nil
8687
enrollmentCompletionDeadline:nil
8788
hashingAlgorithm:nil
8889
secretKey:secret.sharedSecretKey];
8990
}
91+
#endif
9092

9193
+ (PigeonAuthCredential *)getPigeonAuthCredential:(FIRAuthCredential *)authCredential
9294
token:(NSNumber *_Nullable)token {

‎packages/firebase_auth/firebase_auth/ios/Classes/Private/PigeonParser.h

+2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
(nullable PigeonActionCodeSettings *)settings;
2222
+ (PigeonUserCredential *_Nullable)getPigeonUserCredentialFromFIRUser:(nonnull FIRUser *)user;
2323
+ (PigeonIdTokenResult *_Nonnull)parseIdTokenResult:(nonnull FIRAuthTokenResult *)tokenResult;
24+
#if TARGET_OS_IPHONE
2425
+ (PigeonTotpSecret *_Nonnull)getPigeonTotpSecret:(nonnull FIRTOTPSecret *)secret;
26+
#endif
2527
+ (PigeonAuthCredential *_Nullable)getPigeonAuthCredential:
2628
(FIRAuthCredential *_Nullable)authCredentialToken
2729
token:(NSNumber *_Nullable)token;

‎packages/firebase_core/firebase_core/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
412412
GCC_WARN_UNUSED_FUNCTION = YES;
413413
GCC_WARN_UNUSED_VARIABLE = YES;
414-
MACOSX_DEPLOYMENT_TARGET = 10.14;
414+
MACOSX_DEPLOYMENT_TARGET = 10.15;
415415
MTL_ENABLE_DEBUG_INFO = NO;
416416
SDKROOT = macosx;
417417
SWIFT_COMPILATION_MODE = wholemodule;
@@ -495,7 +495,7 @@
495495
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
496496
GCC_WARN_UNUSED_FUNCTION = YES;
497497
GCC_WARN_UNUSED_VARIABLE = YES;
498-
MACOSX_DEPLOYMENT_TARGET = 10.14;
498+
MACOSX_DEPLOYMENT_TARGET = 10.15;
499499
MTL_ENABLE_DEBUG_INFO = YES;
500500
ONLY_ACTIVE_ARCH = YES;
501501
SDKROOT = macosx;
@@ -542,7 +542,7 @@
542542
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
543543
GCC_WARN_UNUSED_FUNCTION = YES;
544544
GCC_WARN_UNUSED_VARIABLE = YES;
545-
MACOSX_DEPLOYMENT_TARGET = 10.14;
545+
MACOSX_DEPLOYMENT_TARGET = 10.15;
546546
MTL_ENABLE_DEBUG_INFO = NO;
547547
SDKROOT = macosx;
548548
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_core/firebase_core/ios/firebase_sdk_version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# https://firebase.google.com/support/release-notes/ios
22
def firebase_sdk_version!()
3-
'10.29.0'
3+
'11.0.0'
44
end

‎packages/firebase_crashlytics/firebase_crashlytics/example/macos/Runner.xcodeproj/project.pbxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@
445445
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
446446
GCC_WARN_UNUSED_FUNCTION = YES;
447447
GCC_WARN_UNUSED_VARIABLE = YES;
448-
MACOSX_DEPLOYMENT_TARGET = 10.14;
448+
MACOSX_DEPLOYMENT_TARGET = 10.15;
449449
MTL_ENABLE_DEBUG_INFO = NO;
450450
SDKROOT = macosx;
451451
SWIFT_COMPILATION_MODE = wholemodule;
@@ -472,7 +472,7 @@
472472
"$(inherited)",
473473
"@executable_path/../Frameworks",
474474
);
475-
MACOSX_DEPLOYMENT_TARGET = 10.13;
475+
MACOSX_DEPLOYMENT_TARGET = 10.15;
476476
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.crashlytics.example;
477477
PROVISIONING_PROFILE_SPECIFIER = "";
478478
SWIFT_VERSION = 5.0;
@@ -531,7 +531,7 @@
531531
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
532532
GCC_WARN_UNUSED_FUNCTION = YES;
533533
GCC_WARN_UNUSED_VARIABLE = YES;
534-
MACOSX_DEPLOYMENT_TARGET = 10.14;
534+
MACOSX_DEPLOYMENT_TARGET = 10.15;
535535
MTL_ENABLE_DEBUG_INFO = YES;
536536
ONLY_ACTIVE_ARCH = YES;
537537
SDKROOT = macosx;
@@ -578,7 +578,7 @@
578578
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
579579
GCC_WARN_UNUSED_FUNCTION = YES;
580580
GCC_WARN_UNUSED_VARIABLE = YES;
581-
MACOSX_DEPLOYMENT_TARGET = 10.14;
581+
MACOSX_DEPLOYMENT_TARGET = 10.15;
582582
MTL_ENABLE_DEBUG_INFO = NO;
583583
SDKROOT = macosx;
584584
SWIFT_COMPILATION_MODE = wholemodule;
@@ -605,7 +605,7 @@
605605
"$(inherited)",
606606
"@executable_path/../Frameworks",
607607
);
608-
MACOSX_DEPLOYMENT_TARGET = 10.13;
608+
MACOSX_DEPLOYMENT_TARGET = 10.15;
609609
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.crashlytics.example;
610610
PROVISIONING_PROFILE_SPECIFIER = "";
611611
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -632,7 +632,7 @@
632632
"$(inherited)",
633633
"@executable_path/../Frameworks",
634634
);
635-
MACOSX_DEPLOYMENT_TARGET = 10.13;
635+
MACOSX_DEPLOYMENT_TARGET = 10.15;
636636
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.firebase.crashlytics.example;
637637
PROVISIONING_PROFILE_SPECIFIER = "";
638638
SWIFT_VERSION = 5.0;

‎packages/firebase_database/firebase_database/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@
409409
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
410410
GCC_WARN_UNUSED_FUNCTION = YES;
411411
GCC_WARN_UNUSED_VARIABLE = YES;
412-
MACOSX_DEPLOYMENT_TARGET = 10.14;
412+
MACOSX_DEPLOYMENT_TARGET = 10.15;
413413
MTL_ENABLE_DEBUG_INFO = NO;
414414
SDKROOT = macosx;
415415
SWIFT_COMPILATION_MODE = wholemodule;
@@ -493,7 +493,7 @@
493493
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
494494
GCC_WARN_UNUSED_FUNCTION = YES;
495495
GCC_WARN_UNUSED_VARIABLE = YES;
496-
MACOSX_DEPLOYMENT_TARGET = 10.14;
496+
MACOSX_DEPLOYMENT_TARGET = 10.15;
497497
MTL_ENABLE_DEBUG_INFO = YES;
498498
ONLY_ACTIVE_ARCH = YES;
499499
SDKROOT = macosx;
@@ -540,7 +540,7 @@
540540
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
541541
GCC_WARN_UNUSED_FUNCTION = YES;
542542
GCC_WARN_UNUSED_VARIABLE = YES;
543-
MACOSX_DEPLOYMENT_TARGET = 10.14;
543+
MACOSX_DEPLOYMENT_TARGET = 10.15;
544544
MTL_ENABLE_DEBUG_INFO = NO;
545545
SDKROOT = macosx;
546546
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_messaging/firebase_messaging/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@
427427
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
428428
GCC_WARN_UNUSED_FUNCTION = YES;
429429
GCC_WARN_UNUSED_VARIABLE = YES;
430-
MACOSX_DEPLOYMENT_TARGET = 10.14;
430+
MACOSX_DEPLOYMENT_TARGET = 10.15;
431431
MTL_ENABLE_DEBUG_INFO = NO;
432432
SDKROOT = macosx;
433433
SWIFT_COMPILATION_MODE = wholemodule;
@@ -515,7 +515,7 @@
515515
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
516516
GCC_WARN_UNUSED_FUNCTION = YES;
517517
GCC_WARN_UNUSED_VARIABLE = YES;
518-
MACOSX_DEPLOYMENT_TARGET = 10.14;
518+
MACOSX_DEPLOYMENT_TARGET = 10.15;
519519
MTL_ENABLE_DEBUG_INFO = YES;
520520
ONLY_ACTIVE_ARCH = YES;
521521
SDKROOT = macosx;
@@ -562,7 +562,7 @@
562562
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
563563
GCC_WARN_UNUSED_FUNCTION = YES;
564564
GCC_WARN_UNUSED_VARIABLE = YES;
565-
MACOSX_DEPLOYMENT_TARGET = 10.14;
565+
MACOSX_DEPLOYMENT_TARGET = 10.15;
566566
MTL_ENABLE_DEBUG_INFO = NO;
567567
SDKROOT = macosx;
568568
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@
407407
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
408408
GCC_WARN_UNUSED_FUNCTION = YES;
409409
GCC_WARN_UNUSED_VARIABLE = YES;
410-
MACOSX_DEPLOYMENT_TARGET = 10.14;
410+
MACOSX_DEPLOYMENT_TARGET = 10.15;
411411
MTL_ENABLE_DEBUG_INFO = NO;
412412
SDKROOT = macosx;
413413
SWIFT_COMPILATION_MODE = wholemodule;
@@ -488,7 +488,7 @@
488488
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
489489
GCC_WARN_UNUSED_FUNCTION = YES;
490490
GCC_WARN_UNUSED_VARIABLE = YES;
491-
MACOSX_DEPLOYMENT_TARGET = 10.14;
491+
MACOSX_DEPLOYMENT_TARGET = 10.15;
492492
MTL_ENABLE_DEBUG_INFO = YES;
493493
ONLY_ACTIVE_ARCH = YES;
494494
SDKROOT = macosx;
@@ -535,7 +535,7 @@
535535
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
536536
GCC_WARN_UNUSED_FUNCTION = YES;
537537
GCC_WARN_UNUSED_VARIABLE = YES;
538-
MACOSX_DEPLOYMENT_TARGET = 10.14;
538+
MACOSX_DEPLOYMENT_TARGET = 10.15;
539539
MTL_ENABLE_DEBUG_INFO = NO;
540540
SDKROOT = macosx;
541541
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_remote_config/firebase_remote_config/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@
556556
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
557557
GCC_WARN_UNUSED_FUNCTION = YES;
558558
GCC_WARN_UNUSED_VARIABLE = YES;
559-
MACOSX_DEPLOYMENT_TARGET = 10.14;
559+
MACOSX_DEPLOYMENT_TARGET = 10.15;
560560
MTL_ENABLE_DEBUG_INFO = NO;
561561
SDKROOT = macosx;
562562
SWIFT_COMPILATION_MODE = wholemodule;
@@ -636,7 +636,7 @@
636636
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
637637
GCC_WARN_UNUSED_FUNCTION = YES;
638638
GCC_WARN_UNUSED_VARIABLE = YES;
639-
MACOSX_DEPLOYMENT_TARGET = 10.14;
639+
MACOSX_DEPLOYMENT_TARGET = 10.15;
640640
MTL_ENABLE_DEBUG_INFO = YES;
641641
ONLY_ACTIVE_ARCH = YES;
642642
SDKROOT = macosx;
@@ -683,7 +683,7 @@
683683
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
684684
GCC_WARN_UNUSED_FUNCTION = YES;
685685
GCC_WARN_UNUSED_VARIABLE = YES;
686-
MACOSX_DEPLOYMENT_TARGET = 10.14;
686+
MACOSX_DEPLOYMENT_TARGET = 10.15;
687687
MTL_ENABLE_DEBUG_INFO = NO;
688688
SDKROOT = macosx;
689689
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_storage/firebase_storage/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@
427427
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
428428
GCC_WARN_UNUSED_FUNCTION = YES;
429429
GCC_WARN_UNUSED_VARIABLE = YES;
430-
MACOSX_DEPLOYMENT_TARGET = 10.14;
430+
MACOSX_DEPLOYMENT_TARGET = 10.15;
431431
MTL_ENABLE_DEBUG_INFO = NO;
432432
SDKROOT = macosx;
433433
SWIFT_COMPILATION_MODE = wholemodule;
@@ -511,7 +511,7 @@
511511
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
512512
GCC_WARN_UNUSED_FUNCTION = YES;
513513
GCC_WARN_UNUSED_VARIABLE = YES;
514-
MACOSX_DEPLOYMENT_TARGET = 10.14;
514+
MACOSX_DEPLOYMENT_TARGET = 10.15;
515515
MTL_ENABLE_DEBUG_INFO = YES;
516516
ONLY_ACTIVE_ARCH = YES;
517517
SDKROOT = macosx;
@@ -558,7 +558,7 @@
558558
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
559559
GCC_WARN_UNUSED_FUNCTION = YES;
560560
GCC_WARN_UNUSED_VARIABLE = YES;
561-
MACOSX_DEPLOYMENT_TARGET = 10.14;
561+
MACOSX_DEPLOYMENT_TARGET = 10.15;
562562
MTL_ENABLE_DEBUG_INFO = NO;
563563
SDKROOT = macosx;
564564
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_vertexai/firebase_vertexai/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@
561561
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
562562
GCC_WARN_UNUSED_FUNCTION = YES;
563563
GCC_WARN_UNUSED_VARIABLE = YES;
564-
MACOSX_DEPLOYMENT_TARGET = 10.14;
564+
MACOSX_DEPLOYMENT_TARGET = 10.15;
565565
MTL_ENABLE_DEBUG_INFO = NO;
566566
SDKROOT = macosx;
567567
SWIFT_COMPILATION_MODE = wholemodule;
@@ -643,7 +643,7 @@
643643
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
644644
GCC_WARN_UNUSED_FUNCTION = YES;
645645
GCC_WARN_UNUSED_VARIABLE = YES;
646-
MACOSX_DEPLOYMENT_TARGET = 10.14;
646+
MACOSX_DEPLOYMENT_TARGET = 10.15;
647647
MTL_ENABLE_DEBUG_INFO = YES;
648648
ONLY_ACTIVE_ARCH = YES;
649649
SDKROOT = macosx;
@@ -693,7 +693,7 @@
693693
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
694694
GCC_WARN_UNUSED_FUNCTION = YES;
695695
GCC_WARN_UNUSED_VARIABLE = YES;
696-
MACOSX_DEPLOYMENT_TARGET = 10.14;
696+
MACOSX_DEPLOYMENT_TARGET = 10.15;
697697
MTL_ENABLE_DEBUG_INFO = NO;
698698
SDKROOT = macosx;
699699
SWIFT_COMPILATION_MODE = wholemodule;

‎tests/integration_test/firebase_auth/firebase_auth_instance_e2e_test.dart

+26-20
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,16 @@ void main() {
193193
);
194194
});
195195
},
196-
skip: !kIsWeb && Platform.isWindows,
196+
skip: !kIsWeb && (Platform.isWindows || Platform.isMacOS),
197197
);
198198

199199
group('test all stream listeners', () {
200200
Matcher containsExactlyThreeUsers() => predicate<List>(
201201
(list) => list.whereType<User>().length == 3,
202202
'a list containing exactly 3 User instances',
203203
);
204-
test('create, cancel and reopen all user event stream handlers', () async {
204+
test('create, cancel and reopen all user event stream handlers',
205+
() async {
205206
final auth = FirebaseAuth.instance;
206207
final events = [];
207208
final streamHandler = events.add;
@@ -444,22 +445,27 @@ void main() {
444445
group(
445446
'sendPasswordResetEmail()',
446447
() {
447-
test('should not error', () async {
448-
var email = generateRandomEmail();
448+
test(
449+
'should not error',
450+
() async {
451+
var email = generateRandomEmail();
449452

450-
try {
451-
await FirebaseAuth.instance.createUserWithEmailAndPassword(
452-
email: email,
453-
password: testPassword,
454-
);
453+
try {
454+
await FirebaseAuth.instance.createUserWithEmailAndPassword(
455+
email: email,
456+
password: testPassword,
457+
);
455458

456-
await FirebaseAuth.instance.sendPasswordResetEmail(email: email);
457-
await FirebaseAuth.instance.currentUser!.delete();
458-
} catch (e) {
459-
await FirebaseAuth.instance.currentUser!.delete();
460-
fail(e.toString());
461-
}
462-
});
459+
await FirebaseAuth.instance
460+
.sendPasswordResetEmail(email: email);
461+
await FirebaseAuth.instance.currentUser!.delete();
462+
} catch (e) {
463+
await FirebaseAuth.instance.currentUser!.delete();
464+
fail(e.toString());
465+
}
466+
},
467+
skip: !kIsWeb && Platform.isMacOS,
468+
);
463469

464470
test('fails if the user could not be found', () async {
465471
try {
@@ -515,7 +521,7 @@ void main() {
515521
);
516522
});
517523
},
518-
skip: !kIsWeb && Platform.isWindows,
524+
skip: !kIsWeb && (Platform.isWindows || Platform.isMacOS),
519525
);
520526

521527
group('languageCode', () {
@@ -608,7 +614,7 @@ void main() {
608614
final userCred = await FirebaseAuth.instance.signInAnonymously();
609615
await successCallback(userCred);
610616
},
611-
skip: !kIsWeb && Platform.isWindows,
617+
skip: !kIsWeb && (Platform.isWindows || Platform.isMacOS),
612618
);
613619
});
614620

@@ -624,7 +630,7 @@ void main() {
624630
.signInWithCredential(credential)
625631
.then(commonSuccessCallback);
626632
},
627-
skip: !kIsWeb && Platform.isWindows,
633+
skip: !kIsWeb && (Platform.isWindows || Platform.isMacOS),
628634
);
629635

630636
test('throws if login user is disabled', () async {
@@ -762,7 +768,7 @@ void main() {
762768
expect(idTokenResult.claims!['roles'][0]['role'], 'member');
763769
});
764770
},
765-
skip: !kIsWeb && Platform.isWindows,
771+
skip: !kIsWeb && (Platform.isWindows || Platform.isMacOS),
766772
);
767773

768774
group('signInWithEmailAndPassword()', () {

‎tests/integration_test/firebase_auth/firebase_auth_user_e2e_test.dart

+766-677
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.