Skip to content

Commit 2e78e41

Browse files
committed
Merge branch 'master' into mila/BloomFilter
2 parents abd5af2 + 60f9a33 commit 2e78e41

File tree

16 files changed

+207
-152
lines changed

16 files changed

+207
-152
lines changed

Crashlytics/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Unreleased
1+
# 10.6.0
22
- [added] Added dependency on Firebase Sessions SDK to power future metrics and debugging features in Crashlytics
33

44
# 10.4.0

FirebaseAnalytics.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
s.authors = 'Google, Inc.'
1414

1515
s.source = {
16-
:http => 'https://dl.google.com/firebase/ios/analytics/456fd5f254bd79ce/FirebaseAnalytics-10.4.0.tar.gz'
16+
:http => 'https://dl.google.com/firebase/ios/analytics/c549faaa5cd321b5/FirebaseAnalytics-10.6.0.tar.gz'
1717
}
1818

1919
s.cocoapods_version = '>= 1.10.0'

FirebaseAppDistribution/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Unreleased
1+
# 10.6.0
22
- [fixed] Fixed bug where testers were sent to the wrong URL when signing in (#10772).
33

44
# 10.2.0

FirebasePerformance/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Unreleased
1+
# 10.6.0
22
- [added] Added dependency on Firebase Sessions SDK to power future metrics and debugging features in Performance Monitoring.
33
- [changed] Changed definition of sessions, as Performance Monitoring now depends on the new Firebase Sessions SDK.
44

FirebaseSessions/Sources/Settings/SessionsSettings.swift

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,13 @@ class SessionsSettings: SettingsProtocol {
4646
}
4747

4848
var sessionsEnabled: Bool {
49-
// TODO: Remove this block before release
50-
// Disabling the SDK because some customers seem to be building from master
51-
// Uncomment the code below before release
49+
// Order of precendence LocalOverrides > Remote Settings > SDK Defaults
5250
if let sessionEnabled = localOverrides.sessionsEnabled {
5351
return sessionEnabled
52+
} else if let sessionEnabled = remoteSettings.sessionsEnabled {
53+
return sessionEnabled
5454
}
55-
return false
56-
57-
// TODO: uncomment before release
58-
// // Order of precendence LocalOverrides > Remote Settings > SDK Defaults
59-
// if let sessionEnabled = localOverrides.sessionsEnabled {
60-
// return sessionEnabled
61-
// } else if let sessionEnabled = remoteSettings.sessionsEnabled {
62-
// return sessionEnabled
63-
// }
64-
// return sdkDefaults.sessionsEnabled!
55+
return sdkDefaults.sessionsEnabled!
6556
}
6657

6758
var sessionTimeout: TimeInterval {

FirebaseSessions/Tests/TestApp/AppQualityDevApp-iOS-Info.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.

FirebaseSessions/Tests/TestApp/AppQualityDevApp-macOS-Info.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.

FirebaseSessions/Tests/TestApp/AppQualityDevApp.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@
128128
DF8AEF36295CA3F40013BF14 /* AppQualityDevApp_Crashlytics_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppQualityDevApp_Crashlytics_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
129129
DF9759B8295CE10700EF01BA /* AppQualityDevApp_CrashlyticsPerformance_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppQualityDevApp_CrashlyticsPerformance_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
130130
DF9AC004295CD14F00EFFEB7 /* AppQualityDevApp_Performance_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppQualityDevApp_Performance_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
131-
DFB0F328299A9B5B008DBCB7 /* AppQualityDevApp-iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "AppQualityDevApp-iOS-Info.plist"; sourceTree = "<group>"; };
132-
DFB0F329299AA18D008DBCB7 /* AppQualityDevApp-macOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "AppQualityDevApp-macOS-Info.plist"; sourceTree = "<group>"; };
133131
E26B04C91ED8B954BD747D36 /* Pods-AppQualityDevApp_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppQualityDevApp_iOS.release.xcconfig"; path = "Target Support Files/Pods-AppQualityDevApp_iOS/Pods-AppQualityDevApp_iOS.release.xcconfig"; sourceTree = "<group>"; };
134132
EDA875D20BA56FABDFC9A521 /* Pods_AppQualityDevApp_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppQualityDevApp_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
135133
F1720B933F39C0D8D6A031E5 /* Pods-AppQualityDevAppWatchOS WatchKit Extension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppQualityDevAppWatchOS WatchKit Extension.debug.xcconfig"; path = "Target Support Files/Pods-AppQualityDevAppWatchOS WatchKit Extension/Pods-AppQualityDevAppWatchOS WatchKit Extension.debug.xcconfig"; sourceTree = "<group>"; };
@@ -237,8 +235,6 @@
237235
DF33DA5E28E4941100F7B88B = {
238236
isa = PBXGroup;
239237
children = (
240-
DFB0F329299AA18D008DBCB7 /* AppQualityDevApp-macOS-Info.plist */,
241-
DFB0F328299A9B5B008DBCB7 /* AppQualityDevApp-iOS-Info.plist */,
242238
DF33DA6328E4941100F7B88B /* Shared */,
243239
DF33DA7228E4941400F7B88B /* macOS */,
244240
CF94D83B29070DF600308FF7 /* UITestsiOS */,
@@ -934,7 +930,6 @@
934930
DEVELOPMENT_TEAM = "";
935931
ENABLE_PREVIEWS = YES;
936932
GENERATE_INFOPLIST_FILE = YES;
937-
INFOPLIST_FILE = "AppQualityDevApp-iOS-Info.plist";
938933
INFOPLIST_KEY_CFBundleDisplayName = AppQualityDevApp_iOS;
939934
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
940935
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -971,7 +966,6 @@
971966
DEVELOPMENT_TEAM = "";
972967
ENABLE_PREVIEWS = YES;
973968
GENERATE_INFOPLIST_FILE = YES;
974-
INFOPLIST_FILE = "AppQualityDevApp-iOS-Info.plist";
975969
INFOPLIST_KEY_CFBundleDisplayName = AppQualityDevApp_iOS;
976970
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
977971
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1009,7 +1003,6 @@
10091003
CURRENT_PROJECT_VERSION = 1;
10101004
ENABLE_PREVIEWS = YES;
10111005
GENERATE_INFOPLIST_FILE = YES;
1012-
INFOPLIST_FILE = "AppQualityDevApp-macOS-Info.plist";
10131006
INFOPLIST_KEY_CFBundleDisplayName = AppQualityDevApp_macOS;
10141007
INFOPLIST_KEY_NSHumanReadableCopyright = "";
10151008
LD_RUNPATH_SEARCH_PATHS = (
@@ -1038,7 +1031,6 @@
10381031
CURRENT_PROJECT_VERSION = 1;
10391032
ENABLE_PREVIEWS = YES;
10401033
GENERATE_INFOPLIST_FILE = YES;
1041-
INFOPLIST_FILE = "AppQualityDevApp-macOS-Info.plist";
10421034
INFOPLIST_KEY_CFBundleDisplayName = AppQualityDevApp_macOS;
10431035
INFOPLIST_KEY_NSHumanReadableCopyright = "";
10441036
LD_RUNPATH_SEARCH_PATHS = (

FirebaseSessions/Tests/Unit/SessionsSettingsTests.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ class SessionsSettingsTests: XCTestCase {
8282
remoteSettings: remoteSettings
8383
)
8484

85-
// TODO: uncomment before release
86-
// XCTAssertTrue(sessionSettings.sessionsEnabled)
85+
XCTAssertTrue(sessionSettings.sessionsEnabled)
8786
XCTAssertEqual(sessionSettings.samplingRate, 1.0)
8887
XCTAssertEqual(sessionSettings.sessionTimeout, 30 * 60)
8988
}
@@ -110,8 +109,7 @@ class SessionsSettingsTests: XCTestCase {
110109
remoteSettings: remoteSettings
111110
)
112111

113-
// TODO: uncomment before release
114-
// XCTAssertTrue(sessionSettings.sessionsEnabled)
112+
XCTAssertTrue(sessionSettings.sessionsEnabled)
115113
XCTAssertEqual(sessionSettings.samplingRate, 0.8)
116114
XCTAssertEqual(sessionSettings.sessionTimeout, 50)
117115
}

Firestore/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Unreleased
2+
# 10.6.0
33
- [fixed] Fix a potential high memory usage issue.
44

55
# 10.5.0

0 commit comments

Comments
 (0)