Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update iOS dependencies - Tue Jul 30 2024 #1631

Merged
merged 7 commits into from
Aug 2, 2024
Merged

Update iOS dependencies - Tue Jul 30 2024 #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf6bc0f
Update iOS dependencies - Tue Jul 30 2024
Jul 30, 2024
dc543e9
Fixes for Auth
a-maurice Jul 31, 2024
ab0a870
Fix Firestore, and format files
a-maurice Jul 31, 2024
ffdcde9
File formatting
a-maurice Jul 31, 2024
c1ca997
Update integration_test tvOS target
a-maurice Aug 1, 2024
19731d9
Fix Firestore internal test deployment target
a-maurice Aug 1, 2024
1cf4081
Fix OAuth sign-in not disabling tvOS correctly
a-maurice Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions analytics/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Analytics', '10.28.1'
pod 'Firebase/Analytics', '11.0.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Analytics', '10.28.1'
platform :tvos, '13.0'
pod 'Firebase/Analytics', '11.0.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions analytics/integration_test/integration_test.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
Expand Down Expand Up @@ -616,7 +616,7 @@
SDKROOT = appletvos;
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIREventNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2024 Google LLC

// Copied from Firebase Analytics iOS SDK 10.28.1.
// Copied from Firebase Analytics iOS SDK 11.0.0.

/// @file FIREventNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIRParameterNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2024 Google LLC

// Copied from Firebase Analytics iOS SDK 10.28.1.
// Copied from Firebase Analytics iOS SDK 11.0.0.

/// @file FIRParameterNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIRUserPropertyNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2024 Google LLC

// Copied from Firebase Analytics iOS SDK 10.28.1.
// Copied from Firebase Analytics iOS SDK 11.0.0.

/// @file FIRUserPropertyNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion app/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '13.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '10.28.1'
pod 'Firebase/Analytics', '11.0.0'
end

post_install do |installer|
Expand Down
22 changes: 11 additions & 11 deletions app_check/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/AppCheck', '10.28.1'
pod 'Firebase/Database', '10.28.1'
pod 'Firebase/Auth', '10.28.1'
pod 'Firebase/Storage', '10.28.1'
pod 'Firebase/Functions', '10.28.1'
pod 'Firebase/AppCheck', '11.0.0'
pod 'Firebase/Database', '11.0.0'
pod 'Firebase/Auth', '11.0.0'
pod 'Firebase/Storage', '11.0.0'
pod 'Firebase/Functions', '11.0.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/AppCheck', '10.28.1'
pod 'Firebase/Database', '10.28.1'
pod 'Firebase/Auth', '10.28.1'
pod 'Firebase/Storage', '10.28.1'
pod 'Firebase/Functions', '10.28.1'
platform :tvos, '13.0'
pod 'Firebase/AppCheck', '11.0.0'
pod 'Firebase/Database', '11.0.0'
pod 'Firebase/Auth', '11.0.0'
pod 'Firebase/Storage', '11.0.0'
pod 'Firebase/Functions', '11.0.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions app_check/integration_test/integration_test.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
Expand Down Expand Up @@ -565,7 +565,7 @@
SDKROOT = appletvos;
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
Expand Down
2 changes: 2 additions & 0 deletions auth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ target_include_directories(firebase_auth
${CMAKE_CURRENT_LIST_DIR}/src/include
PRIVATE
${FIREBASE_CPP_SDK_ROOT_DIR}
${FIREBASE_CPP_SDK_ROOT_DIR}/ios_pod/swift_headers
${additional_include_DIR}
)
target_compile_definitions(firebase_auth
Expand Down Expand Up @@ -201,6 +202,7 @@ elseif(IOS)
POD_NAMES
FirebaseCore
FirebaseAuth
FirebaseAuthInterop/FirebaseAuth/Interop
)
if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
set_target_properties(firebase_auth PROPERTIES
Expand Down
6 changes: 3 additions & 3 deletions auth/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Auth', '10.28.1'
pod 'Firebase/Auth', '11.0.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Auth', '10.28.1'
platform :tvos, '13.0'
pod 'Firebase/Auth', '11.0.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions auth/integration_test/integration_test.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
Expand Down Expand Up @@ -643,7 +643,7 @@
SDKROOT = appletvos;
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
Expand Down
8 changes: 5 additions & 3 deletions auth/src/ios/auth_ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
* limitations under the License.
*/

#import "FIRAdditionalUserInfo.h"
#import "FIRAuthDataResult.h"
#import <UIKit/UIKit.h>

#import "FIRAuthErrors.h"
#import "FIROAuthCredential.h"
#import "FIROptions.h"
#import "FirebaseAuthInterop/FIRAuthInterop.h"
// This needs to be after the FIRAuthInterop import
#import "FirebaseAuth-Swift.h"

#include "app/src/app_ios.h"
#include "app/src/assert.h"
Expand Down
8 changes: 4 additions & 4 deletions auth/src/ios/common_ios.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
#define FIREBASE_AUTH_SRC_IOS_COMMON_IOS_H_

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

#import "FIRAuth.h"
#import "FIRAuthCredential.h"
#import "FIROAuthProvider.h"
#import "FIRUser.h"
#import "FIRUserInfo.h"
#import "FIRUserMetadata.h"
#import "FirebaseAuthInterop/FIRAuthInterop.h"
// This needs to be after the FIRAuthInterop import
#import "FirebaseAuth-Swift.h"

#include "app/src/log.h"
#include "app/src/util_ios.h"
Expand Down
12 changes: 11 additions & 1 deletion auth/src/ios/credential_ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@
#include "auth/src/ios/common_ios.h"

#import <GameKit/GameKit.h>
#import <UIKit/UIKit.h>

#import "FIREmailAuthProvider.h"
#import "FIRFacebookAuthProvider.h"
#import "FIRFederatedAuthProvider.h"
#import "FIRGameCenterAuthProvider.h"
#import "FIRGitHubAuthProvider.h"
#import "FIRGoogleAuthProvider.h"
#import "FIROAuthProvider.h"
#import "FirebaseAuthInterop/FIRAuthInterop.h"
// This needs to be after the FIRAuthInterop import
#import "FirebaseAuth-Swift.h"

#if FIREBASE_PLATFORM_IOS
// PhoneAuth is not supported on non-iOS Apple platforms (eg: tvOS).
Expand Down Expand Up @@ -442,6 +445,7 @@ explicit PhoneAuthProviderData(FIRPhoneAuthProvider* objc_provider)
assert(auth_data);
ReferenceCountedFutureImpl& futures = auth_data->future_impl;
const auto handle = futures.SafeAlloc<AuthResult>(kAuthFn_SignInWithProvider, AuthResult());
#if FIREBASE_PLATFORM_IOS
FIROAuthProvider* ios_provider = (FIROAuthProvider*)[FIROAuthProvider
providerWithProviderID:@(provider_data_.provider_id.c_str())
auth:AuthImpl(auth_data)];
Expand All @@ -462,6 +466,12 @@ explicit PhoneAuthProviderData(FIRPhoneAuthProvider* objc_provider)
AuthResult());
return future;
}

#else // non-iOS Apple platforms (eg: tvOS)
Future<AuthResult> future = MakeFuture(&futures, handle);
futures.Complete(handle, kAuthErrorApiNotAvailable,
"OAuth provider sign-in is not supported on non-iOS Apple platforms.");
#endif // FIREBASE_PLATFORM_IOS
}

Future<AuthResult> FederatedOAuthProvider::Link(AuthData* auth_data) {
Expand Down
4 changes: 0 additions & 4 deletions auth/src/ios/user_ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#include "app/src/time.h"
#include "auth/src/ios/common_ios.h"

#if FIREBASE_PLATFORM_IOS
#import "FIRPhoneAuthCredential.h"
#endif

namespace firebase {
namespace auth {

Expand Down
2 changes: 1 addition & 1 deletion cmake/external/firestore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ endif()

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

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/toolchains/apple.toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ if(NOT DEFINED DEPLOYMENT_TARGET)
set(DEPLOYMENT_TARGET "13.0")
else()
# Unless specified, SDK version 11.0 is used by default as minimum target version (iOS, tvOS).
set(DEPLOYMENT_TARGET "11.0")
set(DEPLOYMENT_TARGET "13.0")
endif()
message(STATUS "[DEFAULTS] Using the default min-version since DEPLOYMENT_TARGET not provided!")
elseif(DEFINED DEPLOYMENT_TARGET AND PLATFORM STREQUAL "MAC_CATALYST" AND ${DEPLOYMENT_TARGET} VERSION_LESS "13.0")
Expand Down
2 changes: 1 addition & 1 deletion cmake/toolchains/ios.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ set(CMAKE_OSX_ARCHITECTURES arm64 CACHE STRING "")
set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "")
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "")

# skip TRY_COMPILE checks
set(CMAKE_CXX_COMPILER_WORKS TRUE)
Expand Down
2 changes: 1 addition & 1 deletion cmake/toolchains/ios_simulator.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "")
set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
set(CMAKE_OSX_DEPLOYMENT_TARGET "8.0" CACHE STRING "")
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "")
set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")

# skip TRY_COMPILE checks
Expand Down
10 changes: 5 additions & 5 deletions database/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Database', '10.28.1'
pod 'Firebase/Auth', '10.28.1'
pod 'Firebase/Database', '11.0.0'
pod 'Firebase/Auth', '11.0.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Database', '10.28.1'
pod 'Firebase/Auth', '10.28.1'
platform :tvos, '13.0'
pod 'Firebase/Database', '11.0.0'
pod 'Firebase/Auth', '11.0.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions database/integration_test/integration_test.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
Expand Down Expand Up @@ -565,7 +565,7 @@
SDKROOT = appletvos;
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion dynamic_links/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/DynamicLinks', '10.28.1'
pod 'Firebase/DynamicLinks', '11.0.0'
end

post_install do |installer|
Expand Down
10 changes: 5 additions & 5 deletions firestore/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Firestore', '10.28.1'
pod 'Firebase/Auth', '10.28.1'
pod 'Firebase/Firestore', '11.0.0'
pod 'Firebase/Auth', '11.0.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '10.28.1'
pod 'Firebase/Auth', '10.28.1'
platform :tvos, '13.0'
pod 'Firebase/Firestore', '11.0.0'
pod 'Firebase/Auth', '11.0.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions firestore/integration_test/integration_test.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
Expand Down Expand Up @@ -667,7 +667,7 @@
SDKROOT = appletvos;
SWIFT_VERSION = 5.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
Expand Down
10 changes: 5 additions & 5 deletions firestore/integration_test_internal/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '13.0'
pod 'Firebase/Firestore', '10.28.1'
pod 'Firebase/Auth', '10.28.1'
pod 'Firebase/Firestore', '11.0.0'
pod 'Firebase/Auth', '11.0.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '10.28.1'
pod 'Firebase/Auth', '10.28.1'
platform :tvos, '13.0'
pod 'Firebase/Firestore', '11.0.0'
pod 'Firebase/Auth', '11.0.0'
end

post_install do |installer|
Expand Down
Loading
Loading