Skip to content

Commit bb8ee5d

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger-bota-maurice
authored
Update iOS dependencies - Tue Jul 30 2024 (#1631)
* Update iOS dependencies - Tue Jul 30 2024 ### iOS - Firebase/Analytics → 11.0.0 - Firebase/AppCheck → 11.0.0 - Firebase/Auth → 11.0.0 - Firebase/Core → 11.0.0 - Firebase/CoreOnly → 11.0.0 - Firebase/Crashlytics → 11.0.0 - Firebase/Database → 11.0.0 - Firebase/DynamicLinks → 11.0.0 - Firebase/Firestore → 11.0.0 - Firebase/Functions → 11.0.0 - Firebase/Installations → 11.0.0 - Firebase/Messaging → 11.0.0 - Firebase/RemoteConfig → 11.0.0 - Firebase/Storage → 11.0.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/10168827736). * Fixes for Auth * Fix Firestore, and format files * File formatting * Update integration_test tvOS target * Fix Firestore internal test deployment target * Fix OAuth sign-in not disabling tvOS correctly --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: a-maurice <amaurice@google.com>
1 parent 5363013 commit bb8ee5d

File tree

54 files changed

+6379
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+6379
-195
lines changed

analytics/integration_test/Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
55

66
target 'integration_test' do
77
platform :ios, '13.0'
8-
pod 'Firebase/Analytics', '10.28.1'
8+
pod 'Firebase/Analytics', '11.0.0'
99
end
1010

1111
target 'integration_test_tvos' do
12-
platform :tvos, '12.0'
13-
pod 'Firebase/Analytics', '10.28.1'
12+
platform :tvos, '13.0'
13+
pod 'Firebase/Analytics', '11.0.0'
1414
end
1515

1616
post_install do |installer|

analytics/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@
565565
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
566566
SWIFT_VERSION = 5.3;
567567
TARGETED_DEVICE_FAMILY = 3;
568-
TVOS_DEPLOYMENT_TARGET = 12.0;
568+
TVOS_DEPLOYMENT_TARGET = 13.0;
569569
};
570570
name = Debug;
571571
};
@@ -616,7 +616,7 @@
616616
SDKROOT = appletvos;
617617
SWIFT_VERSION = 5.3;
618618
TARGETED_DEVICE_FAMILY = 3;
619-
TVOS_DEPLOYMENT_TARGET = 12.0;
619+
TVOS_DEPLOYMENT_TARGET = 13.0;
620620
};
621621
name = Release;
622622
};

analytics/ios_headers/FIREventNames.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2024 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 10.28.1.
3+
// Copied from Firebase Analytics iOS SDK 11.0.0.
44

55
/// @file FIREventNames.h
66
///

analytics/ios_headers/FIRParameterNames.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2024 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 10.28.1.
3+
// Copied from Firebase Analytics iOS SDK 11.0.0.
44

55
/// @file FIRParameterNames.h
66
///

analytics/ios_headers/FIRUserPropertyNames.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2024 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 10.28.1.
3+
// Copied from Firebase Analytics iOS SDK 11.0.0.
44

55
/// @file FIRUserPropertyNames.h
66
///

app/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '13.0'
44
use_frameworks! :linkage => :static
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '10.28.1'
7+
pod 'Firebase/Analytics', '11.0.0'
88
end
99

1010
post_install do |installer|

app_check/integration_test/Podfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '13.0'
7-
pod 'Firebase/AppCheck', '10.28.1'
8-
pod 'Firebase/Database', '10.28.1'
9-
pod 'Firebase/Auth', '10.28.1'
10-
pod 'Firebase/Storage', '10.28.1'
11-
pod 'Firebase/Functions', '10.28.1'
7+
pod 'Firebase/AppCheck', '11.0.0'
8+
pod 'Firebase/Database', '11.0.0'
9+
pod 'Firebase/Auth', '11.0.0'
10+
pod 'Firebase/Storage', '11.0.0'
11+
pod 'Firebase/Functions', '11.0.0'
1212
end
1313

1414
target 'integration_test_tvos' do
15-
platform :tvos, '12.0'
16-
pod 'Firebase/AppCheck', '10.28.1'
17-
pod 'Firebase/Database', '10.28.1'
18-
pod 'Firebase/Auth', '10.28.1'
19-
pod 'Firebase/Storage', '10.28.1'
20-
pod 'Firebase/Functions', '10.28.1'
15+
platform :tvos, '13.0'
16+
pod 'Firebase/AppCheck', '11.0.0'
17+
pod 'Firebase/Database', '11.0.0'
18+
pod 'Firebase/Auth', '11.0.0'
19+
pod 'Firebase/Storage', '11.0.0'
20+
pod 'Firebase/Functions', '11.0.0'
2121
end
2222

2323
post_install do |installer|

app_check/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@
514514
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
515515
SWIFT_VERSION = 5.3;
516516
TARGETED_DEVICE_FAMILY = 3;
517-
TVOS_DEPLOYMENT_TARGET = 12.0;
517+
TVOS_DEPLOYMENT_TARGET = 13.0;
518518
};
519519
name = Debug;
520520
};
@@ -565,7 +565,7 @@
565565
SDKROOT = appletvos;
566566
SWIFT_VERSION = 5.3;
567567
TARGETED_DEVICE_FAMILY = 3;
568-
TVOS_DEPLOYMENT_TARGET = 12.0;
568+
TVOS_DEPLOYMENT_TARGET = 13.0;
569569
};
570570
name = Release;
571571
};

auth/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ target_include_directories(firebase_auth
174174
${CMAKE_CURRENT_LIST_DIR}/src/include
175175
PRIVATE
176176
${FIREBASE_CPP_SDK_ROOT_DIR}
177+
${FIREBASE_CPP_SDK_ROOT_DIR}/ios_pod/swift_headers
177178
${additional_include_DIR}
178179
)
179180
target_compile_definitions(firebase_auth
@@ -201,6 +202,7 @@ elseif(IOS)
201202
POD_NAMES
202203
FirebaseCore
203204
FirebaseAuth
205+
FirebaseAuthInterop/FirebaseAuth/Interop
204206
)
205207
if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
206208
set_target_properties(firebase_auth PROPERTIES

auth/integration_test/Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '13.0'
7-
pod 'Firebase/Auth', '10.28.1'
7+
pod 'Firebase/Auth', '11.0.0'
88
end
99

1010
target 'integration_test_tvos' do
11-
platform :tvos, '12.0'
12-
pod 'Firebase/Auth', '10.28.1'
11+
platform :tvos, '13.0'
12+
pod 'Firebase/Auth', '11.0.0'
1313
end
1414

1515
post_install do |installer|

auth/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@
592592
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
593593
SWIFT_VERSION = 5.3;
594594
TARGETED_DEVICE_FAMILY = 3;
595-
TVOS_DEPLOYMENT_TARGET = 12.0;
595+
TVOS_DEPLOYMENT_TARGET = 13.0;
596596
};
597597
name = Debug;
598598
};
@@ -643,7 +643,7 @@
643643
SDKROOT = appletvos;
644644
SWIFT_VERSION = 5.3;
645645
TARGETED_DEVICE_FAMILY = 3;
646-
TVOS_DEPLOYMENT_TARGET = 12.0;
646+
TVOS_DEPLOYMENT_TARGET = 13.0;
647647
};
648648
name = Release;
649649
};

auth/src/ios/auth_ios.mm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRAdditionalUserInfo.h"
18-
#import "FIRAuthDataResult.h"
17+
#import <UIKit/UIKit.h>
18+
1919
#import "FIRAuthErrors.h"
20-
#import "FIROAuthCredential.h"
2120
#import "FIROptions.h"
21+
#import "FirebaseAuthInterop/FIRAuthInterop.h"
22+
// This needs to be after the FIRAuthInterop import
23+
#import "FirebaseAuth-Swift.h"
2224

2325
#include "app/src/app_ios.h"
2426
#include "app/src/assert.h"

auth/src/ios/common_ios.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
#define FIREBASE_AUTH_SRC_IOS_COMMON_IOS_H_
1919

2020
#import <Foundation/Foundation.h>
21+
#import <UIKit/UIKit.h>
2122

2223
#import "FIRAuth.h"
23-
#import "FIRAuthCredential.h"
24-
#import "FIROAuthProvider.h"
2524
#import "FIRUser.h"
26-
#import "FIRUserInfo.h"
27-
#import "FIRUserMetadata.h"
25+
#import "FirebaseAuthInterop/FIRAuthInterop.h"
26+
// This needs to be after the FIRAuthInterop import
27+
#import "FirebaseAuth-Swift.h"
2828

2929
#include "app/src/log.h"
3030
#include "app/src/util_ios.h"

auth/src/ios/credential_ios.mm

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@
1919
#include "auth/src/ios/common_ios.h"
2020

2121
#import <GameKit/GameKit.h>
22+
#import <UIKit/UIKit.h>
2223

2324
#import "FIREmailAuthProvider.h"
2425
#import "FIRFacebookAuthProvider.h"
2526
#import "FIRFederatedAuthProvider.h"
2627
#import "FIRGameCenterAuthProvider.h"
2728
#import "FIRGitHubAuthProvider.h"
2829
#import "FIRGoogleAuthProvider.h"
29-
#import "FIROAuthProvider.h"
30+
#import "FirebaseAuthInterop/FIRAuthInterop.h"
31+
// This needs to be after the FIRAuthInterop import
32+
#import "FirebaseAuth-Swift.h"
3033

3134
#if FIREBASE_PLATFORM_IOS
3235
// PhoneAuth is not supported on non-iOS Apple platforms (eg: tvOS).
@@ -442,6 +445,7 @@ explicit PhoneAuthProviderData(FIRPhoneAuthProvider* objc_provider)
442445
assert(auth_data);
443446
ReferenceCountedFutureImpl& futures = auth_data->future_impl;
444447
const auto handle = futures.SafeAlloc<AuthResult>(kAuthFn_SignInWithProvider, AuthResult());
448+
#if FIREBASE_PLATFORM_IOS
445449
FIROAuthProvider* ios_provider = (FIROAuthProvider*)[FIROAuthProvider
446450
providerWithProviderID:@(provider_data_.provider_id.c_str())
447451
auth:AuthImpl(auth_data)];
@@ -462,6 +466,12 @@ explicit PhoneAuthProviderData(FIRPhoneAuthProvider* objc_provider)
462466
AuthResult());
463467
return future;
464468
}
469+
470+
#else // non-iOS Apple platforms (eg: tvOS)
471+
Future<AuthResult> future = MakeFuture(&futures, handle);
472+
futures.Complete(handle, kAuthErrorApiNotAvailable,
473+
"OAuth provider sign-in is not supported on non-iOS Apple platforms.");
474+
#endif // FIREBASE_PLATFORM_IOS
465475
}
466476

467477
Future<AuthResult> FederatedOAuthProvider::Link(AuthData* auth_data) {

auth/src/ios/user_ios.mm

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
#include "app/src/time.h"
1818
#include "auth/src/ios/common_ios.h"
1919

20-
#if FIREBASE_PLATFORM_IOS
21-
#import "FIRPhoneAuthCredential.h"
22-
#endif
23-
2420
namespace firebase {
2521
namespace auth {
2622

cmake/external/firestore.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ endif()
2020

2121
# If the format of the line below changes, then be sure to update
2222
# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
23-
set(version CocoaPods-10.28.1)
23+
set(version CocoaPods-11.0.0)
2424

2525
function(GetReleasedDep)
2626
message("Getting released firebase-ios-sdk @ ${version}")

cmake/toolchains/apple.toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ if(NOT DEFINED DEPLOYMENT_TARGET)
257257
set(DEPLOYMENT_TARGET "13.0")
258258
else()
259259
# Unless specified, SDK version 11.0 is used by default as minimum target version (iOS, tvOS).
260-
set(DEPLOYMENT_TARGET "11.0")
260+
set(DEPLOYMENT_TARGET "13.0")
261261
endif()
262262
message(STATUS "[DEFAULTS] Using the default min-version since DEPLOYMENT_TARGET not provided!")
263263
elseif(DEFINED DEPLOYMENT_TARGET AND PLATFORM STREQUAL "MAC_CATALYST" AND ${DEPLOYMENT_TARGET} VERSION_LESS "13.0")

cmake/toolchains/ios.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ set(CMAKE_OSX_ARCHITECTURES arm64 CACHE STRING "")
3535
set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
3636
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
3737
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
38-
set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "")
38+
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "")
3939

4040
# skip TRY_COMPILE checks
4141
set(CMAKE_CXX_COMPILER_WORKS TRUE)

cmake/toolchains/ios_simulator.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "")
1717
set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
1818
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
1919
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
20-
set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "")
20+
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "")
2121
set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
2222

2323
# skip TRY_COMPILE checks

database/integration_test/Podfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '13.0'
7-
pod 'Firebase/Database', '10.28.1'
8-
pod 'Firebase/Auth', '10.28.1'
7+
pod 'Firebase/Database', '11.0.0'
8+
pod 'Firebase/Auth', '11.0.0'
99
end
1010

1111
target 'integration_test_tvos' do
12-
platform :tvos, '12.0'
13-
pod 'Firebase/Database', '10.28.1'
14-
pod 'Firebase/Auth', '10.28.1'
12+
platform :tvos, '13.0'
13+
pod 'Firebase/Database', '11.0.0'
14+
pod 'Firebase/Auth', '11.0.0'
1515
end
1616

1717
post_install do |installer|

database/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@
514514
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
515515
SWIFT_VERSION = 5.3;
516516
TARGETED_DEVICE_FAMILY = 3;
517-
TVOS_DEPLOYMENT_TARGET = 12.0;
517+
TVOS_DEPLOYMENT_TARGET = 13.0;
518518
};
519519
name = Debug;
520520
};
@@ -565,7 +565,7 @@
565565
SDKROOT = appletvos;
566566
SWIFT_VERSION = 5.3;
567567
TARGETED_DEVICE_FAMILY = 3;
568-
TVOS_DEPLOYMENT_TARGET = 12.0;
568+
TVOS_DEPLOYMENT_TARGET = 13.0;
569569
};
570570
name = Release;
571571
};

dynamic_links/integration_test/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use_frameworks! :linkage => :static
55

66
target 'integration_test' do
77
platform :ios, '13.0'
8-
pod 'Firebase/DynamicLinks', '10.28.1'
8+
pod 'Firebase/DynamicLinks', '11.0.0'
99
end
1010

1111
post_install do |installer|

firestore/integration_test/Podfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '13.0'
7-
pod 'Firebase/Firestore', '10.28.1'
8-
pod 'Firebase/Auth', '10.28.1'
7+
pod 'Firebase/Firestore', '11.0.0'
8+
pod 'Firebase/Auth', '11.0.0'
99
end
1010

1111
target 'integration_test_tvos' do
12-
platform :tvos, '12.0'
13-
pod 'Firebase/Firestore', '10.28.1'
14-
pod 'Firebase/Auth', '10.28.1'
12+
platform :tvos, '13.0'
13+
pod 'Firebase/Firestore', '11.0.0'
14+
pod 'Firebase/Auth', '11.0.0'
1515
end
1616

1717
post_install do |installer|

firestore/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@
613613
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
614614
SWIFT_VERSION = 5.3;
615615
TARGETED_DEVICE_FAMILY = 3;
616-
TVOS_DEPLOYMENT_TARGET = 12.0;
616+
TVOS_DEPLOYMENT_TARGET = 13.0;
617617
};
618618
name = Debug;
619619
};
@@ -667,7 +667,7 @@
667667
SDKROOT = appletvos;
668668
SWIFT_VERSION = 5.3;
669669
TARGETED_DEVICE_FAMILY = 3;
670-
TVOS_DEPLOYMENT_TARGET = 12.0;
670+
TVOS_DEPLOYMENT_TARGET = 13.0;
671671
};
672672
name = Release;
673673
};

firestore/integration_test_internal/Podfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '13.0'
7-
pod 'Firebase/Firestore', '10.28.1'
8-
pod 'Firebase/Auth', '10.28.1'
7+
pod 'Firebase/Firestore', '11.0.0'
8+
pod 'Firebase/Auth', '11.0.0'
99
end
1010

1111
target 'integration_test_tvos' do
12-
platform :tvos, '12.0'
13-
pod 'Firebase/Firestore', '10.28.1'
14-
pod 'Firebase/Auth', '10.28.1'
12+
platform :tvos, '13.0'
13+
pod 'Firebase/Firestore', '11.0.0'
14+
pod 'Firebase/Auth', '11.0.0'
1515
end
1616

1717
post_install do |installer|

0 commit comments

Comments
 (0)