Skip to content

Commit f219540

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger-botchkuang-gdconeybea-maurice
authored
Update mobile dependencies - Tue Sep 20 2022 (#1076)
* Update mobile dependencies - Tue Sep 20 2022 - com.google.firebase.firebase_bom → 30.5.0 - Firebase/Analytics → 9.6.0 - Firebase/Auth → 9.6.0 - Firebase/Core → 9.6.0 - Firebase/Crashlytics → 9.6.0 - Firebase/Database → 9.6.0 - Firebase/DynamicLinks → 9.6.0 - Firebase/Functions → 9.6.0 - Firebase/Installations → 9.6.0 - Firebase/Messaging → 9.6.0 - Firebase/RemoteConfig → 9.6.0 - Firebase/Storage → 9.6.0 - FirebaseFirestore → 9.6.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/3086495299). **New changes** - Fixed Firestore SDk usage of `api::Query::Filter` Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: chkuang-g <[email protected]> * Patch in the decltype lambda fix in Firestore's local_store.cc from firebase/firebase-ios-sdk#10237 Co-authored-by: firebase-workflow-trigger-bot <[email protected]> Co-authored-by: chkuang-g <[email protected]> Co-authored-by: Denver Coneybeare <[email protected]> Co-authored-by: a-maurice <[email protected]>
1 parent 5e79c61 commit f219540

File tree

45 files changed

+186
-109
lines changed

Some content is hidden

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

45 files changed

+186
-109
lines changed

‎Android/firebase_dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ project.afterEvaluate {
156156

157157
// Add the bill-of-materials
158158
project.dependencies {
159-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
159+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
160160
}
161161
for (String lib : firebaseCpp.dependencies.libSet) {
162162
// Generate and include the proguard file

‎admob/admob_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
48+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.firebase:firebase-ads:19.8.0'
5151
}

‎admob/integration_test/Podfile

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

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '9.5.0'
7+
pod 'Firebase/Analytics', '9.6.0'
88
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk2'
99
end
1010

‎analytics/integration_test/Podfile

Lines changed: 2 additions & 2 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, '10.0'
8-
pod 'Firebase/Analytics', '9.5.0'
8+
pod 'Firebase/Analytics', '9.6.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'Firebase/Analytics', '9.5.0'
13+
pod 'Firebase/Analytics', '9.6.0'
1414
end
1515

1616
post_install do |installer|

‎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 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.5.0.
3+
// Copied from Firebase Analytics iOS SDK 9.6.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 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.5.0.
3+
// Copied from Firebase Analytics iOS SDK 9.6.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 2022 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 9.5.0.
3+
// Copied from Firebase Analytics iOS SDK 9.6.0.
44

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

‎app/app_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050
}
5151

5252
dependencies {
53-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
53+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
5454
implementation 'com.google.firebase:firebase-analytics'
5555
}
5656

‎app/google_api_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
}
5454

5555
dependencies {
56-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
56+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.android.gms:play-services-base:18.1.0'
5959
implementation project(':app:app_resources')

‎app/integration_test/Podfile

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

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

1010
post_install do |installer|

‎app/invites_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
52+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-dynamic-links'
5555
implementation project(':app:app_resources')

‎auth/auth_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
52+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
5353
implementation 'com.google.firebase:firebase-analytics'
5454
implementation 'com.google.firebase:firebase-auth'
5555
implementation project(':app:app_resources')

‎auth/integration_test/Podfile

Lines changed: 2 additions & 2 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, '10.0'
7-
pod 'Firebase/Auth', '9.5.0'
7+
pod 'Firebase/Auth', '9.6.0'
88
end
99

1010
target 'integration_test_tvos' do
1111
platform :tvos, '12.0'
12-
pod 'Firebase/Auth', '9.5.0'
12+
pod 'Firebase/Auth', '9.6.0'
1313
end
1414

1515
post_install do |installer|

‎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-9.4.0)
23+
set(version CocoaPods-9.6.0)
2424

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

‎cmake/external/firestore.patch.txt

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,78 @@ index 920bf2928..c5c9cc7ee 100644
2323

2424
PREFIX ${PROJECT_BINARY_DIR}
2525

26+
diff --git a/Firestore/core/src/local/local_store.cc b/Firestore/core/src/local/local_store.cc
27+
index 7685f1959..b48b4f9d2 100644
28+
--- a/Firestore/core/src/local/local_store.cc
29+
+++ b/Firestore/core/src/local/local_store.cc
30+
@@ -662,15 +662,10 @@ absl::optional<bundle::NamedQuery> LocalStore::GetNamedQuery(
31+
32+
void LocalStore::ConfigureFieldIndexes(
33+
std::vector<FieldIndex> new_field_indexes) {
34+
- auto cmp = [](const FieldIndex& left, const FieldIndex& right) {
35+
- return FieldIndex::SemanticCompare(left, right) ==
36+
- util::ComparisonResult::Ascending;
37+
- };
38+
-
39+
// This lambda function takes a rvalue vector as parameter,
40+
// then coverts it to a sorted set based on the compare function above.
41+
- auto convertToSet = [&](std::vector<FieldIndex>&& vec) {
42+
- std::set<FieldIndex, decltype(cmp)> result(cmp);
43+
+ auto convertToSet = [](std::vector<FieldIndex>&& vec) {
44+
+ std::set<FieldIndex, FieldIndex::SemanticLess> result;
45+
for (auto& index : vec) {
46+
result.insert(std::move(index));
47+
}
48+
@@ -678,7 +673,7 @@ void LocalStore::ConfigureFieldIndexes(
49+
};
50+
51+
return persistence_->Run("Configure indexes", [&] {
52+
- return util::DiffSets<FieldIndex, decltype(cmp)>(
53+
+ return util::DiffSets<FieldIndex, FieldIndex::SemanticLess>(
54+
convertToSet(index_manager_->GetFieldIndexes()),
55+
convertToSet(std::move(new_field_indexes)), FieldIndex::SemanticCompare,
56+
[this](const model::FieldIndex& index) {
57+
diff --git a/Firestore/core/src/model/field_index.h b/Firestore/core/src/model/field_index.h
58+
index 96353b65f..57f159e9c 100644
59+
--- a/Firestore/core/src/model/field_index.h
60+
+++ b/Firestore/core/src/model/field_index.h
61+
@@ -285,6 +285,21 @@ class FieldIndex {
62+
/** Returns the ArrayContains/ArrayContainsAny segment for this index. */
63+
absl::optional<Segment> GetArraySegment() const;
64+
65+
+ /**
66+
+ * A type that can be used as the "Compare" template parameter of ordered
67+
+ * collections to have the elements ordered using
68+
+ * `FieldIndex::SemanticCompare()`.
69+
+ *
70+
+ * Example:
71+
+ * std::set<FieldIndex, FieldIndex::SemanticLess> result;
72+
+ */
73+
+ struct SemanticLess {
74+
+ bool operator()(const FieldIndex& left, const FieldIndex& right) const {
75+
+ return FieldIndex::SemanticCompare(left, right) ==
76+
+ util::ComparisonResult::Ascending;
77+
+ }
78+
+ };
79+
+
80+
private:
81+
friend bool operator==(const FieldIndex& lhs, const FieldIndex& rhs);
82+
friend bool operator!=(const FieldIndex& lhs, const FieldIndex& rhs);
83+
diff --git a/Firestore/core/test/unit/local/leveldb_local_store_test.cc b/Firestore/core/test/unit/local/leveldb_local_store_test.cc
84+
index 4813b9816..54f24e90b 100644
85+
--- a/Firestore/core/test/unit/local/leveldb_local_store_test.cc
86+
+++ b/Firestore/core/test/unit/local/leveldb_local_store_test.cc
87+
@@ -69,12 +69,7 @@ std::unique_ptr<LocalStoreTestHelper> Factory() {
88+
// This lambda function takes a rvalue vector as parameter,
89+
// then coverts it to a sorted set based on the compare function.
90+
auto convertToSet = [](std::vector<FieldIndex>&& vec) {
91+
- auto cmp = [](const FieldIndex& left, const FieldIndex& right) {
92+
- return FieldIndex::SemanticCompare(left, right) ==
93+
- util::ComparisonResult::Ascending;
94+
- };
95+
-
96+
- std::set<FieldIndex, decltype(cmp)> result(cmp);
97+
+ std::set<FieldIndex, FieldIndex::SemanticLess> result;
98+
for (auto& index : vec) {
99+
result.insert(std::move(index));
100+
}

‎database/database_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
48+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.firebase:firebase-database'
5151
//implementation project(':app:app_resources')

‎database/integration_test/Podfile

Lines changed: 4 additions & 4 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, '10.0'
7-
pod 'Firebase/Database', '9.5.0'
8-
pod 'Firebase/Auth', '9.5.0'
7+
pod 'Firebase/Database', '9.6.0'
8+
pod 'Firebase/Auth', '9.6.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'Firebase/Database', '9.5.0'
14-
pod 'Firebase/Auth', '9.5.0'
13+
pod 'Firebase/Database', '9.6.0'
14+
pod 'Firebase/Auth', '9.6.0'
1515
end
1616

1717
post_install do |installer|

‎dynamic_links/integration_test/Podfile

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

66
target 'integration_test' do
7-
pod 'Firebase/DynamicLinks', '9.5.0'
7+
pod 'Firebase/DynamicLinks', '9.6.0'
88
end
99

1010
post_install do |installer|

‎firestore/firestore_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
}
5454

5555
dependencies {
56-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
56+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
5757
implementation 'com.google.firebase:firebase-analytics'
5858
implementation 'com.google.firebase:firebase-firestore'
5959
}

‎firestore/integration_test/Podfile

Lines changed: 4 additions & 4 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, '10.0'
7-
pod 'FirebaseFirestore', '9.4.0'
8-
pod 'Firebase/Auth', '9.5.0'
7+
pod 'Firebase/Firestore', '9.6.0'
8+
pod 'Firebase/Auth', '9.6.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'FirebaseFirestore', '9.4.0'
14-
pod 'Firebase/Auth', '9.5.0'
13+
pod 'Firebase/Firestore', '9.6.0'
14+
pod 'Firebase/Auth', '9.6.0'
1515
end
1616

1717
post_install do |installer|

‎firestore/integration_test_internal/Podfile

Lines changed: 4 additions & 4 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, '10.0'
7-
pod 'FirebaseFirestore', '9.4.0'
8-
pod 'Firebase/Auth', '9.5.0'
7+
pod 'Firebase/Firestore', '9.6.0'
8+
pod 'Firebase/Auth', '9.6.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'FirebaseFirestore', '9.4.0'
14-
pod 'Firebase/Auth', '9.5.0'
13+
pod 'Firebase/Firestore', '9.6.0'
14+
pod 'Firebase/Auth', '9.6.0'
1515
end
1616

1717
post_install do |installer|

‎firestore/src/main/query_main.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ Query QueryInternal::Where(const FieldPath& field_path,
102102
user_data_converter_.ParseQueryValue(value);
103103
auto describer = [&value] { return Describe(value.type()); };
104104

105-
api::Query decorated = query_.Filter(path, op, std::move(parsed), describer);
105+
api::Query decorated = query_.AddNewFilter(
106+
query_.ParseFieldFilter(path, op, std::move(parsed), describer));
106107
return MakePublic(std::move(decorated));
107108
}
108109

@@ -115,7 +116,8 @@ Query QueryInternal::Where(const FieldPath& field_path,
115116
user_data_converter_.ParseQueryValue(array_value, true);
116117
auto describer = [&array_value] { return Describe(array_value.type()); };
117118

118-
api::Query decorated = query_.Filter(path, op, std::move(parsed), describer);
119+
api::Query decorated = query_.AddNewFilter(
120+
query_.ParseFieldFilter(path, op, std::move(parsed), describer));
119121
return MakePublic(std::move(decorated));
120122
}
121123

‎functions/integration_test/Podfile

Lines changed: 4 additions & 4 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, '10.0'
7-
pod 'Firebase/Functions', '9.5.0'
8-
pod 'Firebase/Auth', '9.5.0'
7+
pod 'Firebase/Functions', '9.6.0'
8+
pod 'Firebase/Auth', '9.6.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '12.0'
13-
pod 'Firebase/Functions', '9.5.0'
14-
pod 'Firebase/Auth', '9.5.0'
13+
pod 'Firebase/Functions', '9.6.0'
14+
pod 'Firebase/Auth', '9.6.0'
1515
end
1616

1717
post_install do |installer|

‎gma/gma_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation platform('com.google.firebase:firebase-bom:30.4.0')
48+
implementation platform('com.google.firebase:firebase-bom:30.5.0')
4949
implementation 'com.google.firebase:firebase-analytics'
5050
implementation 'com.google.android.gms:play-services-ads:21.2.0'
5151
}

‎gma/integration_test/Podfile

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

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '9.5.0'
7+
pod 'Firebase/Analytics', '9.6.0'
88
pod 'Google-Mobile-Ads-SDK', '9.9.0'
99
end
1010

‎installations/integration_test/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ platform :ios, '10.0'
44
use_frameworks! :linkage => :static
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '9.5.0'
8-
pod 'Firebase/Installations', '9.5.0'
7+
pod 'Firebase/Analytics', '9.6.0'
8+
pod 'Firebase/Installations', '9.6.0'
99
end
1010

1111
post_install do |installer|

‎ios_pod/Podfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ platform :ios, '10.0'
33
use_frameworks!
44

55
target 'GetPods' do
6-
pod 'Firebase/Core', '9.5.0'
6+
pod 'Firebase/Core', '9.6.0'
77

88
pod 'Google-Mobile-Ads-SDK', '9.9.0'
9-
pod 'Firebase/Analytics', '9.5.0'
10-
pod 'Firebase/Auth', '9.5.0'
11-
pod 'Firebase/Crashlytics', '9.5.0'
12-
pod 'Firebase/Database', '9.5.0'
13-
pod 'Firebase/DynamicLinks', '9.5.0'
14-
pod 'FirebaseFirestore', '9.4.0'
15-
pod 'Firebase/Functions', '9.5.0'
16-
pod 'Firebase/Installations', '9.5.0'
17-
pod 'Firebase/Messaging', '9.5.0'
18-
pod 'Firebase/RemoteConfig', '9.5.0'
19-
pod 'Firebase/Storage', '9.5.0'
9+
pod 'Firebase/Analytics', '9.6.0'
10+
pod 'Firebase/Auth', '9.6.0'
11+
pod 'Firebase/Crashlytics', '9.6.0'
12+
pod 'Firebase/Database', '9.6.0'
13+
pod 'Firebase/DynamicLinks', '9.6.0'
14+
pod 'Firebase/Firestore', '9.6.0'
15+
pod 'Firebase/Functions', '9.6.0'
16+
pod 'Firebase/Installations', '9.6.0'
17+
pod 'Firebase/Messaging', '9.6.0'
18+
pod 'Firebase/RemoteConfig', '9.6.0'
19+
pod 'Firebase/Storage', '9.6.0'
2020

2121
end

0 commit comments

Comments
 (0)