From 35355ceead55e1431ab91273cb7dd5b92a7b7a44 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Mon, 10 Jan 2022 13:47:56 -0800 Subject: [PATCH 1/4] fix packaging issues --- FirebaseAnonymousAuthUI.podspec | 2 +- FirebaseAuthUI.podspec | 2 +- FirebaseDatabaseUI.podspec | 2 +- FirebaseEmailAuthUI.podspec | 2 +- FirebaseFacebookAuthUI.podspec | 2 +- FirebaseFirestoreUI.podspec | 2 +- FirebaseGoogleAuthUI.podspec | 2 +- FirebaseOAuthUI.podspec | 2 +- FirebasePhoneAuthUI.podspec | 2 +- FirebaseStorageUI.podspec | 2 +- FirebaseUI.podspec | 2 +- Package.swift | 11 +---------- test.sh | 2 +- 13 files changed, 13 insertions(+), 22 deletions(-) diff --git a/FirebaseAnonymousAuthUI.podspec b/FirebaseAnonymousAuthUI.podspec index 112884dc605..b27c3e717ad 100644 --- a/FirebaseAnonymousAuthUI.podspec +++ b/FirebaseAnonymousAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAnonymousAuthUI' - s.version = '12.0.0' + s.version = '12.1.1' s.summary = 'Provides anonymous auth support for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseAuthUI.podspec b/FirebaseAuthUI.podspec index ab9629d9b55..2bc3addbd31 100644 --- a/FirebaseAuthUI.podspec +++ b/FirebaseAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAuthUI' - s.version = '12.1.0' + s.version = '12.1.1' s.summary = 'A prebuilt authentication UI flow for Firebase Auth.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseDatabaseUI.podspec b/FirebaseDatabaseUI.podspec index 4bc154a226c..be618906341 100644 --- a/FirebaseDatabaseUI.podspec +++ b/FirebaseDatabaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseDatabaseUI' - s.version = '12.0.0' + s.version = '12.1.1' s.summary = 'Prebuilt data sources and UI bindings for Firebase Database.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseEmailAuthUI.podspec b/FirebaseEmailAuthUI.podspec index e810ee1a8de..7954cd35b44 100644 --- a/FirebaseEmailAuthUI.podspec +++ b/FirebaseEmailAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseEmailAuthUI' - s.version = '12.0.0' + s.version = '12.1.1' s.summary = 'An email authentication provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec index 5d7c29b34ad..1c4028352f2 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFacebookAuthUI' - s.version = '12.1.0' + s.version = '12.1.1' s.summary = 'A Facebook auth provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseFirestoreUI.podspec b/FirebaseFirestoreUI.podspec index 5873ddfbe66..ca12e1bb52a 100644 --- a/FirebaseFirestoreUI.podspec +++ b/FirebaseFirestoreUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFirestoreUI' - s.version = '12.0.0' + s.version = '12.1.1' s.summary = 'Data libraries and UI bindings for Firestore.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseGoogleAuthUI.podspec b/FirebaseGoogleAuthUI.podspec index e609e053446..0207b508e04 100644 --- a/FirebaseGoogleAuthUI.podspec +++ b/FirebaseGoogleAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseGoogleAuthUI' - s.version = '12.0.0' + s.version = '12.1.1' s.summary = 'Google authentication for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseOAuthUI.podspec b/FirebaseOAuthUI.podspec index c4976c667c5..a42a90b3e9d 100644 --- a/FirebaseOAuthUI.podspec +++ b/FirebaseOAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseOAuthUI' - s.version = '12.0.2' + s.version = '12.1.1' s.summary = 'A collection of OAuth providers for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebasePhoneAuthUI.podspec b/FirebasePhoneAuthUI.podspec index 1cf4c36a6f2..7496a403e43 100644 --- a/FirebasePhoneAuthUI.podspec +++ b/FirebasePhoneAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebasePhoneAuthUI' - s.version = '12.0.0' + s.version = '12.1.1' s.summary = 'A phone auth provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseStorageUI.podspec b/FirebaseStorageUI.podspec index 3329cabef6f..f52503a361c 100644 --- a/FirebaseStorageUI.podspec +++ b/FirebaseStorageUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseStorageUI' - s.version = '12.0.0' + s.version = '12.1.1' s.summary = 'UI binding libraries for Firebase.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/FirebaseUI.podspec b/FirebaseUI.podspec index 713645e1534..6ed628fcfb2 100644 --- a/FirebaseUI.podspec +++ b/FirebaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseUI' - s.version = '12.0.2' + s.version = '12.1.1' s.summary = 'UI binding libraries for Firebase.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } diff --git a/Package.swift b/Package.swift index 863f908f8b7..62bd19fbce7 100644 --- a/Package.swift +++ b/Package.swift @@ -67,7 +67,7 @@ let package = Package( .package( name: "Facebook", url: "https://github.com/facebook/facebook-ios-sdk.git", - from: "11.0.0" + from: "11.2.0" ), .package( name: "Firebase", @@ -134,12 +134,6 @@ let package = Package( resources: [ .process("Resources"), .process("Strings"), - .process("AccountManagement/FUIAccountSettingsViewController.xib"), - .process("AccountManagement/FUIInputTableViewCell.xib"), - .process("AccountManagement/FUIPasswordTableViewCell.xib"), - .process("FUIAuthPickerViewController.xib"), - .process("FUIAuthTableViewCell.xib"), - .process("FUIStaticContentTableViewController.xib"), ], publicHeadersPath: "Public", cSettings: [ @@ -232,9 +226,6 @@ let package = Package( resources: [ .process("Resources"), .process("Strings"), - .process("CountryCode/FUICountryTableViewController.xib"), - .process("FUIPhoneEntryViewController.xib"), - .process("FUIPhoneVerificationViewController.xib"), ], publicHeadersPath: "Public", cSettings: [ diff --git a/test.sh b/test.sh index 20f47ec1d5e..6c678f076e6 100755 --- a/test.sh +++ b/test.sh @@ -11,7 +11,7 @@ pushd "$module_name"; -workspace "$module_name.xcworkspace" \ -scheme "$module_name" \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,OS=latest,name=iPhone 11 Pro' \ + -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' \ clean build test \ ONLY_ACTIVE_ARCH=YES \ | xcpretty) || EXIT_STATUS=$?; From 4a3e94ac09dea2511b8849f2625299f55e3e4957 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Tue, 11 Jan 2022 16:03:57 -0800 Subject: [PATCH 2/4] use Facebook 12 --- FirebaseFacebookAuthUI.podspec | 2 +- Package.swift | 2 +- samples/swift/Podfile.lock | 339 ++++++++++++++++++++++----------- 3 files changed, 234 insertions(+), 109 deletions(-) diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec index 1c4028352f2..ebb0dbb7772 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.dependency 'FirebaseAuth' s.dependency 'FirebaseCore' s.dependency 'FirebaseAuthUI' - s.dependency 'FBSDKLoginKit', '~> 11.0' + s.dependency 'FBSDKLoginKit', '~> 12.0' s.dependency 'FBSDKCoreKit_Basics' s.resource_bundles = { 'FirebaseFacebookAuthUI' => ['FirebaseFacebookAuthUI/Sources/{Resources,Strings}/*.{png,lproj}'] diff --git a/Package.swift b/Package.swift index 62bd19fbce7..669209b3f9f 100644 --- a/Package.swift +++ b/Package.swift @@ -67,7 +67,7 @@ let package = Package( .package( name: "Facebook", url: "https://github.com/facebook/facebook-ios-sdk.git", - from: "11.2.0" + from: "12.0.0" ), .package( name: "Firebase", diff --git a/samples/swift/Podfile.lock b/samples/swift/Podfile.lock index 01835f141c8..15cf75fc761 100644 --- a/samples/swift/Podfile.lock +++ b/samples/swift/Podfile.lock @@ -83,8 +83,45 @@ PODS: - abseil/base/throw_delegate (0.20200225.0): - abseil/base/config - abseil/base/raw_logging_internal + - abseil/container/common (0.20200225.0): + - abseil/meta/type_traits + - abseil/types/optional - abseil/container/compressed_tuple (0.20200225.0): - abseil/utility/utility + - abseil/container/container_memory (0.20200225.0): + - abseil/memory/memory + - abseil/utility/utility + - abseil/container/fixed_array (0.20200225.0): + - abseil/algorithm/algorithm + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/throw_delegate + - abseil/container/compressed_tuple + - abseil/memory/memory + - abseil/container/flat_hash_map (0.20200225.0): + - abseil/algorithm/container + - abseil/container/container_memory + - abseil/container/hash_function_defaults + - abseil/container/raw_hash_map + - abseil/memory/memory + - abseil/container/hash_function_defaults (0.20200225.0): + - abseil/base/config + - abseil/hash/hash + - abseil/strings/strings + - abseil/container/hash_policy_traits (0.20200225.0): + - abseil/meta/type_traits + - abseil/container/hashtable_debug_hooks (0.20200225.0): + - abseil/base/config + - abseil/container/hashtablez_sampler (0.20200225.0): + - abseil/base/base + - abseil/base/core_headers + - abseil/base/exponential_biased + - abseil/container/have_sse + - abseil/debugging/stacktrace + - abseil/memory/memory + - abseil/synchronization/synchronization + - abseil/utility/utility + - abseil/container/have_sse (0.20200225.0) - abseil/container/inlined_vector (0.20200225.0): - abseil/algorithm/algorithm - abseil/base/core_headers @@ -97,6 +134,70 @@ PODS: - abseil/memory/memory - abseil/meta/type_traits - abseil/types/span + - abseil/container/layout (0.20200225.0): + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/strings/strings + - abseil/types/span + - abseil/utility/utility + - abseil/container/raw_hash_map (0.20200225.0): + - abseil/base/throw_delegate + - abseil/container/container_memory + - abseil/container/raw_hash_set + - abseil/container/raw_hash_set (0.20200225.0): + - abseil/base/bits + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/container/common + - abseil/container/compressed_tuple + - abseil/container/container_memory + - abseil/container/hash_policy_traits + - abseil/container/hashtable_debug_hooks + - abseil/container/hashtablez_sampler + - abseil/container/have_sse + - abseil/container/layout + - abseil/memory/memory + - abseil/meta/type_traits + - abseil/utility/utility + - abseil/debugging/debugging_internal (0.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/errno_saver + - abseil/base/raw_logging_internal + - abseil/debugging/demangle_internal (0.20200225.0): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/debugging/stacktrace (0.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/debugging/debugging_internal + - abseil/debugging/symbolize (0.20200225.0): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/malloc_internal + - abseil/base/raw_logging_internal + - abseil/debugging/debugging_internal + - abseil/debugging/demangle_internal + - abseil/hash/city (0.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/hash/hash (0.20200225.0): + - abseil/base/core_headers + - abseil/base/endian + - abseil/container/fixed_array + - abseil/hash/city + - abseil/meta/type_traits + - abseil/numeric/int128 + - abseil/strings/strings + - abseil/types/optional + - abseil/types/variant + - abseil/utility/utility - abseil/memory (0.20200225.0): - abseil/memory/memory (= 0.20200225.0) - abseil/memory/memory (0.20200225.0): @@ -136,6 +237,31 @@ PODS: - abseil/meta/type_traits - abseil/numeric/int128 - abseil/strings/internal + - abseil/synchronization/graphcycles_internal (0.20200225.0): + - abseil/base/base + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/malloc_internal + - abseil/base/raw_logging_internal + - abseil/synchronization/kernel_timeout_internal (0.20200225.0): + - abseil/base/core_headers + - abseil/base/raw_logging_internal + - abseil/time/time + - abseil/synchronization/synchronization (0.20200225.0): + - abseil/base/atomic_hook + - abseil/base/base + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/malloc_internal + - abseil/base/raw_logging_internal + - abseil/debugging/stacktrace + - abseil/debugging/symbolize + - abseil/synchronization/graphcycles_internal + - abseil/synchronization/kernel_timeout_internal + - abseil/time/time - abseil/time (0.20200225.0): - abseil/time/internal (= 0.20200225.0) - abseil/time/time (= 0.20200225.0) @@ -223,58 +349,55 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.7): - BoringSSL-GRPC/Interface (= 0.0.7) - BoringSSL-GRPC/Interface (0.0.7) - - FBSDKCoreKit (11.0.1): - - FBSDKCoreKit/Core (= 11.0.1) - - FBSDKCoreKit/Core (11.0.1): - - FBSDKCoreKit_Basics (~> 11.0.1) - - FBSDKCoreKit_Basics (11.0.1): - - FBSDKCoreKit_Basics/Basics (= 11.0.1) - - FBSDKCoreKit_Basics/Basics (11.0.1) - - FBSDKLoginKit (11.0.1): - - FBSDKLoginKit/Login (= 11.0.1) - - FBSDKLoginKit/Login (11.0.1): - - FBSDKCoreKit (~> 11.0.1) - - FBSDKCoreKit_Basics (~> 11.0.1) - - FirebaseAnonymousAuthUI (11.0.3): + - FBAEMKit (12.2.1): + - FBSDKCoreKit_Basics (= 12.2.1) + - FBSDKCoreKit (12.2.1): + - FBAEMKit (= 12.2.1) + - FBSDKCoreKit_Basics (= 12.2.1) + - FBSDKCoreKit_Basics (12.2.1) + - FBSDKLoginKit (12.2.1): + - FBSDKCoreKit (= 12.2.1) + - FirebaseAnonymousAuthUI (12.1.1): - FirebaseAuth (~> 8.0) - FirebaseAuthUI - FirebaseCore - - FirebaseAuth (8.3.0): + - FirebaseAuth (8.10.0): - FirebaseCore (~> 8.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/Environment (~> 7.4) + - GoogleUtilities/AppDelegateSwizzler (~> 7.6) + - GoogleUtilities/Environment (~> 7.6) - GTMSessionFetcher/Core (~> 1.5) - - FirebaseAuthUI (11.0.3): + - FirebaseAuthUI (12.1.1): - FirebaseAuth (~> 8.0) - FirebaseCore - - FirebaseCore (8.3.0): + - FirebaseCore (8.10.0): - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.4) - - GoogleUtilities/Logger (~> 7.4) - - FirebaseCoreDiagnostics (8.3.0): - - GoogleDataTransport (~> 9.0) - - GoogleUtilities/Environment (~> 7.4) - - GoogleUtilities/Logger (~> 7.4) + - GoogleUtilities/Environment (~> 7.6) + - GoogleUtilities/Logger (~> 7.6) + - FirebaseCoreDiagnostics (8.10.0): + - GoogleDataTransport (~> 9.1) + - GoogleUtilities/Environment (~> 7.6) + - GoogleUtilities/Logger (~> 7.6) - nanopb (~> 2.30908.0) - - FirebaseDatabase (8.3.0): + - FirebaseDatabase (8.10.0): - FirebaseCore (~> 8.0) - leveldb-library (~> 1.22) - - FirebaseDatabaseUI (11.0.3): + - FirebaseDatabaseUI (12.1.1): - FirebaseDatabase (~> 8.0) - - FirebaseEmailAuthUI (11.0.3): + - FirebaseEmailAuthUI (12.1.1): - FirebaseAuth - FirebaseAuthUI - FirebaseCore - GoogleUtilities/UserDefaults - - FirebaseFacebookAuthUI (11.1.3): + - FirebaseFacebookAuthUI (12.1.1): - FBSDKCoreKit_Basics - - FBSDKLoginKit (~> 11.0) + - FBSDKLoginKit (~> 12.0) - FirebaseAuth - FirebaseAuthUI - FirebaseCore - - FirebaseFirestore (8.3.0): + - FirebaseFirestore (8.10.0): - abseil/algorithm (= 0.20200225.0) - abseil/base (= 0.20200225.0) + - abseil/container/flat_hash_map (= 0.20200225.0) - abseil/memory (= 0.20200225.0) - abseil/meta (= 0.20200225.0) - abseil/strings/strings (= 0.20200225.0) @@ -284,80 +407,80 @@ PODS: - "gRPC-C++ (~> 1.28.0)" - leveldb-library (~> 1.22) - nanopb (~> 2.30908.0) - - FirebaseFirestoreUI (11.0.3): + - FirebaseFirestoreUI (12.1.1): - FirebaseFirestore (~> 8.0) - - FirebaseGoogleAuthUI (11.0.3): + - FirebaseGoogleAuthUI (12.1.1): - FirebaseAuth - FirebaseAuthUI - FirebaseCore - GoogleSignIn (~> 6.0) - - FirebaseOAuthUI (11.1.3): + - FirebaseOAuthUI (12.1.1): - FirebaseAuth (~> 8.0) - - FirebaseAuthUI - - FirebasePhoneAuthUI (11.0.3): + - FirebaseAuthUI (< 13.0, >= 12.0.2) + - FirebasePhoneAuthUI (12.1.1): - FirebaseAuth - FirebaseAuthUI - - FirebaseStorage (8.3.0): + - FirebaseStorage (8.10.0): - FirebaseCore (~> 8.0) - GTMSessionFetcher/Core (~> 1.5) - - FirebaseStorageUI (11.0.3): + - FirebaseStorageUI (12.1.1): - FirebaseStorage (~> 8.0) - SDWebImage (~> 5.6) - - FirebaseUI (11.0.3): - - FirebaseUI/Anonymous (= 11.0.3) - - FirebaseUI/Auth (= 11.0.3) - - FirebaseUI/Database (= 11.0.3) - - FirebaseUI/Email (= 11.0.3) - - FirebaseUI/Facebook (= 11.0.3) - - FirebaseUI/Firestore (= 11.0.3) - - FirebaseUI/Google (= 11.0.3) - - FirebaseUI/OAuth (= 11.0.3) - - FirebaseUI/Phone (= 11.0.3) - - FirebaseUI/Storage (= 11.0.3) - - FirebaseUI/Anonymous (11.0.3): - - FirebaseAnonymousAuthUI (~> 11.0) - - FirebaseUI/Auth (11.0.3): - - FirebaseAuthUI (~> 11.0) - - FirebaseUI/Database (11.0.3): - - FirebaseDatabaseUI (~> 11.0) - - FirebaseUI/Email (11.0.3): - - FirebaseEmailAuthUI (~> 11.0) - - FirebaseUI/Facebook (11.0.3): - - FirebaseFacebookAuthUI (~> 11.0) - - FirebaseUI/Firestore (11.0.3): - - FirebaseFirestoreUI (~> 11.0) - - FirebaseUI/Google (11.0.3): - - FirebaseGoogleAuthUI (~> 11.0) - - FirebaseUI/OAuth (11.0.3): - - FirebaseOAuthUI (~> 11.0) - - FirebaseUI/Phone (11.0.3): - - FirebasePhoneAuthUI (~> 11.0) - - FirebaseUI/Storage (11.0.3): - - FirebaseStorageUI (~> 11.0) - - GoogleDataTransport (9.1.0): + - FirebaseUI (12.1.1): + - FirebaseUI/Anonymous (= 12.1.1) + - FirebaseUI/Auth (= 12.1.1) + - FirebaseUI/Database (= 12.1.1) + - FirebaseUI/Email (= 12.1.1) + - FirebaseUI/Facebook (= 12.1.1) + - FirebaseUI/Firestore (= 12.1.1) + - FirebaseUI/Google (= 12.1.1) + - FirebaseUI/OAuth (= 12.1.1) + - FirebaseUI/Phone (= 12.1.1) + - FirebaseUI/Storage (= 12.1.1) + - FirebaseUI/Anonymous (12.1.1): + - FirebaseAnonymousAuthUI (~> 12.0) + - FirebaseUI/Auth (12.1.1): + - FirebaseAuthUI (~> 12.0) + - FirebaseUI/Database (12.1.1): + - FirebaseDatabaseUI (~> 12.0) + - FirebaseUI/Email (12.1.1): + - FirebaseEmailAuthUI (~> 12.0) + - FirebaseUI/Facebook (12.1.1): + - FirebaseFacebookAuthUI (~> 12.0) + - FirebaseUI/Firestore (12.1.1): + - FirebaseFirestoreUI (~> 12.0) + - FirebaseUI/Google (12.1.1): + - FirebaseGoogleAuthUI (~> 12.0) + - FirebaseUI/OAuth (12.1.1): + - FirebaseOAuthUI (~> 12.0) + - FirebaseUI/Phone (12.1.1): + - FirebasePhoneAuthUI (~> 12.0) + - FirebaseUI/Storage (12.1.1): + - FirebaseStorageUI (~> 12.0) + - GoogleDataTransport (9.1.2): - GoogleUtilities/Environment (~> 7.2) - nanopb (~> 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleSignIn (6.0.0): + - GoogleSignIn (6.1.0): - AppAuth (~> 1.4) - GTMAppAuth (~> 1.0) - GTMSessionFetcher/Core (~> 1.1) - - GoogleUtilities/AppDelegateSwizzler (7.5.0): + - GoogleUtilities/AppDelegateSwizzler (7.7.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.5.0): + - GoogleUtilities/Environment (7.7.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.5.0): + - GoogleUtilities/Logger (7.7.0): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.5.0): + - GoogleUtilities/Network (7.7.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.5.0)" - - GoogleUtilities/Reachability (7.5.0): + - "GoogleUtilities/NSData+zlib (7.7.0)" + - GoogleUtilities/Reachability (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.5.0): + - GoogleUtilities/UserDefaults (7.7.0): - GoogleUtilities/Logger - "gRPC-C++ (1.28.2)": - "gRPC-C++/Implementation (= 1.28.2)" @@ -386,7 +509,7 @@ PODS: - GTMAppAuth (1.2.2): - AppAuth/Core (~> 1.4) - GTMSessionFetcher/Core (~> 1.5) - - GTMSessionFetcher/Core (1.6.1) + - GTMSessionFetcher/Core (1.7.0) - leveldb-library (1.22.1) - nanopb (2.30908.0): - nanopb/decode (= 2.30908.0) @@ -394,9 +517,9 @@ PODS: - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - PromisesObjC (2.0.0) - - SDWebImage (5.11.1): - - SDWebImage/Core (= 5.11.1) - - SDWebImage/Core (5.11.1) + - SDWebImage (5.12.2): + - SDWebImage/Core (= 5.12.2) + - SDWebImage/Core (5.12.2) DEPENDENCIES: - FirebaseAnonymousAuthUI (from `../../`) @@ -416,6 +539,7 @@ SPEC REPOS: - abseil - AppAuth - BoringSSL-GRPC + - FBAEMKit - FBSDKCoreKit - FBSDKCoreKit_Basics - FBSDKLoginKit @@ -465,38 +589,39 @@ SPEC CHECKSUMS: abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7 BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879 - FBSDKCoreKit: 38c9e29a3f1436362acacff6486d3a28628c288f - FBSDKCoreKit_Basics: 06780a4a12e16596bde8406add02c6aa1bf38616 - FBSDKLoginKit: 8243e04c590c38b85c69fcf09d1234514d2475c3 - FirebaseAnonymousAuthUI: 64de9383870378e8f16ef428d73e8c18e74ce5cc - FirebaseAuth: fd12c82de44e7ad3b821610c387b8251f03aa0f9 - FirebaseAuthUI: 3f6dcb6f9e1af8e889916e2e0f0f971a70c2d303 - FirebaseCore: a6dba751680d7033b9d3831e1cfc95ead0605118 - FirebaseCoreDiagnostics: 7e873baabcfaa9512f538554ae4fa0817aaafbdb - FirebaseDatabase: 3cb36bbf667be87d72cebc8dbe72e2e8cac1d615 - FirebaseDatabaseUI: 4db2acaaee3c1a73e0daf31e926a8b7212941607 - FirebaseEmailAuthUI: 9d3ef1a6b89049079baaaea254f30c205176ceea - FirebaseFacebookAuthUI: 4110202288720f9a74be9c1aa2d3308a39589566 - FirebaseFirestore: f4f42828c6d82f6945575611c23dd343e0e7d0aa - FirebaseFirestoreUI: 24a7a35da1a570e8aabd592f60de9438f6959a4c - FirebaseGoogleAuthUI: 70d781b69bc933f7b43cd4363e3772376ed53d2a - FirebaseOAuthUI: 2cac38e94a39f9d930a7ffc30fbad1683b4e0b62 - FirebasePhoneAuthUI: 12bb994905add3399eb0e48f64080d2b916309bb - FirebaseStorage: ff380720c204593d98c3e5482e62ccfbb522f0c5 - FirebaseStorageUI: d66a62c897de1d0f279ec80c7ece6b8afc9c5913 - FirebaseUI: d2777b3abcb3fa40ea9eea9e40db5a154df608d3 - GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9 - GoogleSignIn: b7779a809e1dfb32ebb43131b10d8bfcd53c1383 - GoogleUtilities: eea970f4a389963963bffe8d8fabe43540678b9c + FBAEMKit: 4cea610d0bc1680572f2aad7b25db7a2f2690d82 + FBSDKCoreKit: 5b1992fe65802ca26be7e68bc4fac5f59fa39908 + FBSDKCoreKit_Basics: a6a92ca628e05f86f458a4721574c5ddfb058ba3 + FBSDKLoginKit: 7467b7f988ca4fdf48f12a839bcfce4264752429 + FirebaseAnonymousAuthUI: d360aca0dd89480ad31c632b0f638aa4af932705 + FirebaseAuth: 59a2d2b933b5b79e18fb1e6ad230c6abdaa73d26 + FirebaseAuthUI: 71ad7db60f0e3eb34b790868163dde99fde6d989 + FirebaseCore: 04186597c095da37d90ff9fd3e53bc61a1ff2440 + FirebaseCoreDiagnostics: 56fb7216d87e0e6ec2feddefa9d8a392fe8b2c18 + FirebaseDatabase: 5f3e83b0a0d8759378fbd5d05661244d14dfbbb0 + FirebaseDatabaseUI: 7c7620ad506f829bfd05a3db93a45ae371af33da + FirebaseEmailAuthUI: d4b6c4f450dccc7764ec83b6884ebf2c700d1a7e + FirebaseFacebookAuthUI: b82c83659bd5e44b5daa4b092b689983e5314b0c + FirebaseFirestore: 0e7321a508cc9de54316ec45400caba6b5719beb + FirebaseFirestoreUI: cdfa6c04124a44dfff28fe64385229541206138a + FirebaseGoogleAuthUI: 00f4a3ff878bb96ba5a04cb7752b08235a3dbd9e + FirebaseOAuthUI: 264bbf01beff69162c74f464512f16903a33bb38 + FirebasePhoneAuthUI: bcd9026caa9a97a27a16cc3539eace8df829cf65 + FirebaseStorage: 815410224b548172c578f02554a86bbc8f817f50 + FirebaseStorageUI: e8fecbe7f0524f1d67aea714065e5a46843b2d0e + FirebaseUI: dc90cd9081a0c2dcb94413cfdac3f1b662205c42 + GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 + GoogleSignIn: c90b5bec45e780f54c6a8e1e3c182a86e3dda69d + GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 "gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2 gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5 GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 - GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e + GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 - SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d + SDWebImage: 240e5c12b592fb1268c1d03b8c90d90e8c2ffe82 PODFILE CHECKSUM: 50c55b4b9231c6141172c8e2aba7f1624a881dd7 -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.2 From 211a2a16981d440ecdd6f33282deea62a69d4d1a Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 12 Jan 2022 16:01:32 -0800 Subject: [PATCH 3/4] specify destinations for spm builds --- .github/workflows/anonymousauth.yml | 2 +- .github/workflows/auth.yml | 2 +- .github/workflows/database.yml | 2 +- .github/workflows/emailauth.yml | 2 +- .github/workflows/facebookauth.yml | 2 +- .github/workflows/firestore.yml | 2 +- .github/workflows/googleauth.yml | 2 +- .github/workflows/oauth.yml | 2 +- .github/workflows/phoneauth.yml | 2 +- .github/workflows/storage.yml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/anonymousauth.yml b/.github/workflows/anonymousauth.yml index e51fcf569a1..36d1f3ebc49 100644 --- a/.github/workflows/anonymousauth.yml +++ b/.github/workflows/anonymousauth.yml @@ -54,7 +54,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseAnonymousAuthUI -sdk iphonesimulator + xcodebuild -scheme FirebaseAnonymousAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml index da7acb1a27e..f5b2fe2bf6c 100644 --- a/.github/workflows/auth.yml +++ b/.github/workflows/auth.yml @@ -50,7 +50,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseAuthUI -sdk iphonesimulator + xcodebuild -scheme FirebaseAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 2fb87a29f3c..73642c0e54e 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -50,7 +50,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseDatabaseUI -sdk iphonesimulator + xcodebuild -scheme FirebaseDatabaseUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/emailauth.yml b/.github/workflows/emailauth.yml index 84cabb36b4e..97ea9e796e1 100644 --- a/.github/workflows/emailauth.yml +++ b/.github/workflows/emailauth.yml @@ -54,7 +54,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseEmailAuthUI -sdk iphonesimulator + xcodebuild -scheme FirebaseEmailAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/facebookauth.yml b/.github/workflows/facebookauth.yml index f2c1027a14a..c945f0ad140 100644 --- a/.github/workflows/facebookauth.yml +++ b/.github/workflows/facebookauth.yml @@ -54,7 +54,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseFacebookAuthUI -sdk iphonesimulator + xcodebuild -scheme FirebaseFacebookAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index aa7b0682cee..3342cf2bab3 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -50,7 +50,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseFirestoreUI -sdk iphonesimulator + xcodebuild -scheme FirebaseFirestoreUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/googleauth.yml b/.github/workflows/googleauth.yml index 314987683cf..2b2a0fdd864 100644 --- a/.github/workflows/googleauth.yml +++ b/.github/workflows/googleauth.yml @@ -52,7 +52,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseGoogleAuthUI -sdk iphonesimulator + xcodebuild -scheme FirebaseGoogleAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/oauth.yml b/.github/workflows/oauth.yml index 8c2ad62dee4..aaabb6a7c83 100644 --- a/.github/workflows/oauth.yml +++ b/.github/workflows/oauth.yml @@ -54,7 +54,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseOAuthUI -sdk iphonesimulator + xcodebuild -scheme FirebaseOAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/phoneauth.yml b/.github/workflows/phoneauth.yml index 6aa2bdb7e18..8dd370e5d57 100644 --- a/.github/workflows/phoneauth.yml +++ b/.github/workflows/phoneauth.yml @@ -54,7 +54,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebasePhoneAuthUI -sdk iphonesimulator + xcodebuild -scheme FirebasePhoneAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index a6bd4b17bd5..2b180d05f6a 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -50,7 +50,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseStorageUI -sdk iphonesimulator + xcodebuild -scheme FirebaseStorageUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' pod: name: pod lib lint runs-on: macOS-latest From d536c7d1a2a9fc6bcc9409963924778ab1a4a212 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Wed, 12 Jan 2022 18:10:34 -0800 Subject: [PATCH 4/4] relax fb version restriction --- FirebaseFacebookAuthUI.podspec | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec index ebb0dbb7772..4db05829f14 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.dependency 'FirebaseAuth' s.dependency 'FirebaseCore' s.dependency 'FirebaseAuthUI' - s.dependency 'FBSDKLoginKit', '~> 12.0' + s.dependency 'FBSDKLoginKit', '>= 11.0', '< 13.0' s.dependency 'FBSDKCoreKit_Basics' s.resource_bundles = { 'FirebaseFacebookAuthUI' => ['FirebaseFacebookAuthUI/Sources/{Resources,Strings}/*.{png,lproj}'] diff --git a/Package.swift b/Package.swift index 669209b3f9f..7b5f11db0b4 100644 --- a/Package.swift +++ b/Package.swift @@ -67,7 +67,7 @@ let package = Package( .package( name: "Facebook", url: "https://github.com/facebook/facebook-ios-sdk.git", - from: "12.0.0" + "11.0.0"..<"13.0.0" ), .package( name: "Firebase",