Skip to content

Update mobile dependencies - Tue Aug 29 2023 #1436

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

Merged
merged 3 commits into from
Aug 30, 2023
Merged

Update mobile dependencies - Tue Aug 29 2023 #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
021efac
Update mobile dependencies - Tue Aug 29 2023
Aug 29, 2023
0f5cf00
Update query_main to use normalized_order_bys
a-maurice Aug 30, 2023
5f0a26b
Update query_main.cc
a-maurice Aug 30, 2023
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
4 changes: 2 additions & 2 deletions Android/firebase_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
'firestore' : ['com.google.firebase:firebase-firestore'],
'functions' : ['com.google.firebase:firebase-functions'],
'gma' : ['com.google.android.gms:play-services-ads:22.2.0'],
'gma' : ['com.google.android.gms:play-services-ads:22.3.0'],
'installations' : ['com.google.firebase:firebase-installations'],
'invites' : ['com.google.firebase:firebase-invites'],
// Messaging has an additional local dependency to include.
Expand Down Expand Up @@ -158,7 +158,7 @@ project.afterEvaluate {

// Add the bill-of-materials
project.dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
}
for (String lib : firebaseCpp.dependencies.libSet) {
// Generate and include the proguard file
Expand Down
4 changes: 2 additions & 2 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, '11.0'
pod 'Firebase/Analytics', '10.13.0'
pod 'Firebase/Analytics', '10.14.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Analytics', '10.13.0'
pod 'Firebase/Analytics', '10.14.0'
end

post_install do |installer|
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 2023 Google LLC

// Copied from Firebase Analytics iOS SDK 10.13.0.
// Copied from Firebase Analytics iOS SDK 10.14.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 2023 Google LLC

// Copied from Firebase Analytics iOS SDK 10.13.0.
// Copied from Firebase Analytics iOS SDK 10.14.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 2023 Google LLC

// Copied from Firebase Analytics iOS SDK 10.13.0.
// Copied from Firebase Analytics iOS SDK 10.14.0.

/// @file FIRUserPropertyNames.h
///
Expand Down
2 changes: 1 addition & 1 deletion app/app_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
implementation 'com.google.firebase:firebase-analytics'
}

Expand Down
2 changes: 1 addition & 1 deletion app/google_api_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.android.gms:play-services-base:18.2.0'
implementation project(':app:app_resources')
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, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '10.13.0'
pod 'Firebase/Analytics', '10.14.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion app/invites_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-dynamic-links'
implementation project(':app:app_resources')
Expand Down
2 changes: 1 addition & 1 deletion app_check/app_check_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
implementation 'com.google.firebase:firebase-appcheck'
}

Expand Down
20 changes: 10 additions & 10 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, '11.0'
pod 'Firebase/AppCheck', '10.13.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Storage', '10.13.0'
pod 'Firebase/Functions', '10.13.0'
pod 'Firebase/AppCheck', '10.14.0'
pod 'Firebase/Database', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
pod 'Firebase/Storage', '10.14.0'
pod 'Firebase/Functions', '10.14.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/AppCheck', '10.13.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Storage', '10.13.0'
pod 'Firebase/Functions', '10.13.0'
pod 'Firebase/AppCheck', '10.14.0'
pod 'Firebase/Database', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
pod 'Firebase/Storage', '10.14.0'
pod 'Firebase/Functions', '10.14.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion auth/auth_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-auth'
implementation project(':app:app_resources')
Expand Down
4 changes: 2 additions & 2 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, '11.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Auth', '10.14.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Auth', '10.14.0'
end

post_install do |installer|
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.13.0)
set(version CocoaPods-10.14.0)

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
Expand Down
2 changes: 1 addition & 1 deletion database/database_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-database'
//implementation project(':app:app_resources')
Expand Down
8 changes: 4 additions & 4 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, '11.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Database', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Database', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
end

post_install do |installer|
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 @@ -4,7 +4,7 @@ platform :ios, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/DynamicLinks', '10.13.0'
pod 'Firebase/DynamicLinks', '10.14.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion firestore/firestore_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-firestore'
}
Expand Down
8 changes: 4 additions & 4 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, '11.0'
pod 'Firebase/Firestore', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Firestore', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Firestore', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 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, '11.0'
pod 'Firebase/Firestore', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Firestore', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Firestore', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Firestore', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
end

post_install do |installer|
Expand Down
7 changes: 4 additions & 3 deletions firestore/src/main/query_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ core::Bound QueryInternal::ToBound(
const core::Query& internal_query = query_.query();

SharedMessage<google_firestore_v1_ArrayValue> components{{}};
components->values_count = CheckedSize(internal_query.order_bys().size());
components->values_count =
CheckedSize(internal_query.normalized_order_bys().size());
components->values =
MakeArray<google_firestore_v1_Value>(components->values_count);

Expand All @@ -187,8 +188,8 @@ core::Bound QueryInternal::ToBound(
// the provided document. Without the key (by using the explicit sort orders),
// multiple documents could match the position, yielding duplicate results.

for (size_t i = 0; i < internal_query.order_bys().size(); ++i) {
const core::OrderBy& order_by = internal_query.order_bys()[i];
for (size_t i = 0; i < internal_query.normalized_order_bys().size(); ++i) {
const core::OrderBy& order_by = internal_query.normalized_order_bys()[i];
const model::FieldPath& field_path = order_by.field();

if (field_path.IsKeyFieldPath()) {
Expand Down
8 changes: 4 additions & 4 deletions functions/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, '11.0'
pod 'Firebase/Functions', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Functions', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
end

target 'integration_test_tvos' do
platform :tvos, '12.0'
pod 'Firebase/Functions', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Functions', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions gma/gma_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:32.2.2')
implementation platform('com.google.firebase:firebase-bom:32.2.3')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.android.gms:play-services-ads:22.2.0'
implementation 'com.google.android.gms:play-services-ads:22.3.0'
}

afterEvaluate {
Expand Down
2 changes: 1 addition & 1 deletion gma/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, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/CoreOnly', '10.13.0'
pod 'Firebase/CoreOnly', '10.14.0'
pod 'Google-Mobile-Ads-SDK', '10.9.0'
end

Expand Down
4 changes: 2 additions & 2 deletions installations/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ platform :ios, '11.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '10.13.0'
pod 'Firebase/Installations', '10.13.0'
pod 'Firebase/Analytics', '10.14.0'
pod 'Firebase/Installations', '10.14.0'
end

post_install do |installer|
Expand Down
26 changes: 13 additions & 13 deletions ios_pod/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ platform :ios, '11.0'
use_frameworks!

target 'GetPods' do
pod 'Firebase/Core', '10.13.0'
pod 'Firebase/Core', '10.14.0'

pod 'Google-Mobile-Ads-SDK', '10.9.0'
pod 'Firebase/Analytics', '10.13.0'
pod 'Firebase/AppCheck', '10.13.0'
pod 'Firebase/Auth', '10.13.0'
pod 'Firebase/Crashlytics', '10.13.0'
pod 'Firebase/Database', '10.13.0'
pod 'Firebase/DynamicLinks', '10.13.0'
pod 'Firebase/Firestore', '10.13.0'
pod 'Firebase/Functions', '10.13.0'
pod 'Firebase/Installations', '10.13.0'
pod 'Firebase/Messaging', '10.13.0'
pod 'Firebase/RemoteConfig', '10.13.0'
pod 'Firebase/Storage', '10.13.0'
pod 'Firebase/Analytics', '10.14.0'
pod 'Firebase/AppCheck', '10.14.0'
pod 'Firebase/Auth', '10.14.0'
pod 'Firebase/Crashlytics', '10.14.0'
pod 'Firebase/Database', '10.14.0'
pod 'Firebase/DynamicLinks', '10.14.0'
pod 'Firebase/Firestore', '10.14.0'
pod 'Firebase/Functions', '10.14.0'
pod 'Firebase/Installations', '10.14.0'
pod 'Firebase/Messaging', '10.14.0'
pod 'Firebase/RemoteConfig', '10.14.0'
pod 'Firebase/Storage', '10.14.0'

end
Loading