Skip to content

Commit 7de73ba

Browse files
authored
Pin to a version of iOS with nanopb fix (#1136)
* Pin to a version of iOS with nanopb fix * Update query_main.cc * Update query_main.cc * Update query_main.cc * Update query_main.cc
1 parent 587c0c3 commit 7de73ba

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

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.1.0)
23+
set(version 63c6de7eb9d350b849d545461c8c80ff6a2333fb)
2424

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

firestore/src/main/query_main.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,13 @@ core::Bound QueryInternal::ToBound(
237237
const std::vector<FieldValue>& field_values) const {
238238
const core::Query& internal_query = query_.query();
239239
// Use explicit order bys because it has to match the query the user made.
240+
#if TARGET_OS_IOS || TARGET_OS_TV
240241
const core::OrderByList& explicit_order_bys =
241242
internal_query.explicit_order_bys();
243+
#else
244+
const std::vector<core::OrderBy>& explicit_order_bys =
245+
internal_query.explicit_order_bys();
246+
#endif
242247

243248
if (field_values.size() > explicit_order_bys.size()) {
244249
SimpleThrowInvalidArgument(

0 commit comments

Comments
 (0)