Skip to content

Commit 572475d

Browse files
authored
Cherrypick #3983 and include Database in release. (#3986)
* Remove log argument that causes SocketRocket crash (#3983) * Add FirebaseDatabase to release. * Update CHANGELOG with version.
1 parent 6682aa7 commit 572475d

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

Firebase/Database/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Unreleased
22

3+
# v6.1.1
4+
- [fixed] Fixed an iOS 13 crash that occured in our WebSocket error handling. (#3950)
5+
36
# v6.1.0
47
- [fixed] Fix Catalyst Build issue. (#3512)
58
- [feature] The SDK adds support for the Firebase Database Emulator. To connect

Firebase/Database/third_party/SocketRocket/FSRWebSocket.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,9 @@ - (void)safeHandleEvent:(NSStreamEvent)eventCode stream:(NSStream *)aStream
15101510
}
15111511

15121512
case NSStreamEventErrorOccurred: {
1513-
SRFastLog(@"NSStreamEventErrorOccurred %@ %@", aStream, [[aStream streamError] copy]);
1513+
// Note: The upstream code for SocketRocket logs the error message, but this causes
1514+
// crashes on iOS 13 (https://github.com/firebase/firebase-ios-sdk/issues/3950)
1515+
SRFastLog(@"NSStreamEventErrorOccurred %@", aStream);
15141516
/// TODO specify error better!
15151517
[self _failWithError:aStream.streamError];
15161518
_readBufferOffset = 0;

FirebaseDatabase.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FirebaseDatabase'
3-
s.version = '6.1.0'
3+
s.version = '6.1.1'
44
s.summary = 'Firebase Open Source Libraries for iOS (plus community support for macOS and tvOS)'
55

66
s.description = <<-DESC

Releases/Manifests/6.10.0.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"FirebaseAuth":"6.3.0",
44
"FirebaseCore":"6.3.1",
55
"FirebaseCoreDiagnostics":"1.1.1",
6+
"FirebaseDatabase":"6.1.1",
67
"FirebaseFirestore":"1.6.0",
78
"FirebaseInAppMessaging":"0.15.5",
89
"FirebaseInAppMessagingDisplay":"0.15.5",

0 commit comments

Comments
 (0)