From 666f90ea1eb090ee3f2397c9ffde8ddaf934f36c Mon Sep 17 00:00:00 2001 From: Russell Wheatley Date: Tue, 24 Oct 2023 14:57:18 +0100 Subject: [PATCH] feat: bump Firebase iOS SDK `10.16.0` (#11698) * feat: bump Firebase iOS SDK `10.16.0` * ci: use `iPhone 15 Pro` * ci: use `iPhone 14 Pro` * test(firestore): update exception message test. apple has changed * Discard changes to .github/workflows/e2e_tests.yaml * chore: analyze issue --- .../example/integration_test/query_e2e.dart | 20 +++++++++++++------ .../integration_test/second_database.dart | 20 +++++++++++++------ .../firebase_core/ios/firebase_sdk_version.rb | 2 +- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/example/integration_test/query_e2e.dart b/packages/cloud_firestore/cloud_firestore/example/integration_test/query_e2e.dart index ee23b5e347c7..c77337882813 100644 --- a/packages/cloud_firestore/cloud_firestore/example/integration_test/query_e2e.dart +++ b/packages/cloud_firestore/cloud_firestore/example/integration_test/query_e2e.dart @@ -2225,8 +2225,13 @@ void runQueryTests() { .get(); } catch (e) { expect( - (e as FirebaseException).message, - contains('An error occurred while parsing query arguments'), + (e as FirebaseException) + .message! + .contains('Client specified an invalid argument.') || + e.message!.contains( + 'An error occurred while parsing query arguments', + ), + isTrue, ); expect(e, isA()); } @@ -2403,10 +2408,13 @@ void runQueryTests() { .get(); } catch (e) { expect( - (e as FirebaseException).message, - contains( - 'An error occurred while parsing query arguments', - ), + (e as FirebaseException) + .message! + .contains('Client specified an invalid argument.') || + e.message!.contains( + 'An error occurred while parsing query arguments', + ), + isTrue, ); expect(e, isA()); } diff --git a/packages/cloud_firestore/cloud_firestore/example/integration_test/second_database.dart b/packages/cloud_firestore/cloud_firestore/example/integration_test/second_database.dart index 84e0eae51d35..207b6a587e5d 100644 --- a/packages/cloud_firestore/cloud_firestore/example/integration_test/second_database.dart +++ b/packages/cloud_firestore/cloud_firestore/example/integration_test/second_database.dart @@ -1813,8 +1813,13 @@ void runSecondDatabaseTests() { .get(); } catch (e) { expect( - (e as FirebaseException).message, - contains('An error occurred while parsing query arguments'), + (e as FirebaseException) + .message! + .contains('Client specified an invalid argument.') || + e.message!.contains( + 'An error occurred while parsing query arguments', + ), + isTrue, ); expect(e, isA()); } @@ -1876,10 +1881,13 @@ void runSecondDatabaseTests() { .get(); } catch (e) { expect( - (e as FirebaseException).message, - contains( - 'An error occurred while parsing query arguments', - ), + (e as FirebaseException) + .message! + .contains('Client specified an invalid argument.') || + e.message!.contains( + 'An error occurred while parsing query arguments', + ), + isTrue, ); expect(e, isA()); } diff --git a/packages/firebase_core/firebase_core/ios/firebase_sdk_version.rb b/packages/firebase_core/firebase_core/ios/firebase_sdk_version.rb index a8d63963db88..a5a4dcd1be2c 100644 --- a/packages/firebase_core/firebase_core/ios/firebase_sdk_version.rb +++ b/packages/firebase_core/firebase_core/ios/firebase_sdk_version.rb @@ -1,4 +1,4 @@ # https://firebase.google.com/support/release-notes/ios def firebase_sdk_version!() - '10.15.0' + '10.16.0' end