Skip to content

Commit 29c8d07

Browse files
alanjcharlesalanjcharles
authored
Merge pull request #92 from segment-integrations/bump-firebase
bump firebase dependency to 9.6.0
2 parents 6fbde02 + 8f17c1f commit 29c8d07

File tree

5 files changed

+127
-106
lines changed

5 files changed

+127
-106
lines changed

‎Example/Podfile.lock‎

Lines changed: 100 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,112 @@
11
PODS:
22
- Analytics (4.1.6)
33
- Expecta (1.0.6)
4-
- Firebase (8.10.0):
5-
- Firebase/Core (= 8.10.0)
6-
- Firebase/Core (8.10.0):
4+
- Firebase (9.6.0):
5+
- Firebase/Core (= 9.6.0)
6+
- Firebase/Core (9.6.0):
77
- Firebase/CoreOnly
8-
- FirebaseAnalytics (~> 8.10.0)
9-
- Firebase/CoreOnly (8.10.0):
10-
- FirebaseCore (= 8.10.0)
11-
- FirebaseAnalytics (8.10.0):
12-
- FirebaseAnalytics/AdIdSupport (= 8.10.0)
13-
- FirebaseCore (~> 8.0)
14-
- FirebaseInstallations (~> 8.0)
15-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
16-
- GoogleUtilities/MethodSwizzler (~> 7.6)
17-
- GoogleUtilities/Network (~> 7.6)
18-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
19-
- nanopb (~> 2.30908.0)
20-
- FirebaseAnalytics/AdIdSupport (8.10.0):
21-
- FirebaseCore (~> 8.0)
22-
- FirebaseInstallations (~> 8.0)
23-
- GoogleAppMeasurement (= 8.10.0)
24-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
25-
- GoogleUtilities/MethodSwizzler (~> 7.6)
26-
- GoogleUtilities/Network (~> 7.6)
27-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
28-
- nanopb (~> 2.30908.0)
29-
- FirebaseCore (8.10.0):
30-
- FirebaseCoreDiagnostics (~> 8.0)
31-
- GoogleUtilities/Environment (~> 7.6)
32-
- GoogleUtilities/Logger (~> 7.6)
33-
- FirebaseCoreDiagnostics (8.11.0):
34-
- GoogleDataTransport (~> 9.1)
8+
- FirebaseAnalytics (~> 9.6.0)
9+
- Firebase/CoreOnly (9.6.0):
10+
- FirebaseCore (= 9.6.0)
11+
- FirebaseAnalytics (9.6.0):
12+
- FirebaseAnalytics/AdIdSupport (= 9.6.0)
13+
- FirebaseCore (~> 9.0)
14+
- FirebaseInstallations (~> 9.0)
15+
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
16+
- GoogleUtilities/MethodSwizzler (~> 7.7)
17+
- GoogleUtilities/Network (~> 7.7)
18+
- "GoogleUtilities/NSData+zlib (~> 7.7)"
19+
- nanopb (< 2.30910.0, >= 2.30908.0)
20+
- FirebaseAnalytics/AdIdSupport (9.6.0):
21+
- FirebaseCore (~> 9.0)
22+
- FirebaseInstallations (~> 9.0)
23+
- GoogleAppMeasurement (= 9.6.0)
24+
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
25+
- GoogleUtilities/MethodSwizzler (~> 7.7)
26+
- GoogleUtilities/Network (~> 7.7)
27+
- "GoogleUtilities/NSData+zlib (~> 7.7)"
28+
- nanopb (< 2.30910.0, >= 2.30908.0)
29+
- FirebaseCore (9.6.0):
30+
- FirebaseCoreDiagnostics (~> 9.0)
31+
- FirebaseCoreInternal (~> 9.0)
3532
- GoogleUtilities/Environment (~> 7.7)
3633
- GoogleUtilities/Logger (~> 7.7)
37-
- nanopb (~> 2.30908.0)
38-
- FirebaseInstallations (8.11.0):
39-
- FirebaseCore (~> 8.0)
34+
- FirebaseCoreDiagnostics (9.6.0):
35+
- GoogleDataTransport (< 10.0.0, >= 9.1.4)
36+
- GoogleUtilities/Environment (~> 7.7)
37+
- GoogleUtilities/Logger (~> 7.7)
38+
- nanopb (< 2.30910.0, >= 2.30908.0)
39+
- FirebaseCoreInternal (9.6.0):
40+
- "GoogleUtilities/NSData+zlib (~> 7.7)"
41+
- FirebaseInstallations (9.6.0):
42+
- FirebaseCore (~> 9.0)
4043
- GoogleUtilities/Environment (~> 7.7)
4144
- GoogleUtilities/UserDefaults (~> 7.7)
45+
- PromisesObjC (~> 2.1)
46+
- GoogleAppMeasurement (9.6.0):
47+
- GoogleAppMeasurement/AdIdSupport (= 9.6.0)
48+
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
49+
- GoogleUtilities/MethodSwizzler (~> 7.7)
50+
- GoogleUtilities/Network (~> 7.7)
51+
- "GoogleUtilities/NSData+zlib (~> 7.7)"
52+
- nanopb (< 2.30910.0, >= 2.30908.0)
53+
- GoogleAppMeasurement/AdIdSupport (9.6.0):
54+
- GoogleAppMeasurement/WithoutAdIdSupport (= 9.6.0)
55+
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
56+
- GoogleUtilities/MethodSwizzler (~> 7.7)
57+
- GoogleUtilities/Network (~> 7.7)
58+
- "GoogleUtilities/NSData+zlib (~> 7.7)"
59+
- nanopb (< 2.30910.0, >= 2.30908.0)
60+
- GoogleAppMeasurement/WithoutAdIdSupport (9.6.0):
61+
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
62+
- GoogleUtilities/MethodSwizzler (~> 7.7)
63+
- GoogleUtilities/Network (~> 7.7)
64+
- "GoogleUtilities/NSData+zlib (~> 7.7)"
65+
- nanopb (< 2.30910.0, >= 2.30908.0)
66+
- GoogleDataTransport (9.2.0):
67+
- GoogleUtilities/Environment (~> 7.7)
68+
- nanopb (< 2.30910.0, >= 2.30908.0)
4269
- PromisesObjC (< 3.0, >= 1.2)
43-
- GoogleAppMeasurement (8.10.0):
44-
- GoogleAppMeasurement/AdIdSupport (= 8.10.0)
45-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
46-
- GoogleUtilities/MethodSwizzler (~> 7.6)
47-
- GoogleUtilities/Network (~> 7.6)
48-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
49-
- nanopb (~> 2.30908.0)
50-
- GoogleAppMeasurement/AdIdSupport (8.10.0):
51-
- GoogleAppMeasurement/WithoutAdIdSupport (= 8.10.0)
52-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
53-
- GoogleUtilities/MethodSwizzler (~> 7.6)
54-
- GoogleUtilities/Network (~> 7.6)
55-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
56-
- nanopb (~> 2.30908.0)
57-
- GoogleAppMeasurement/WithoutAdIdSupport (8.10.0):
58-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
59-
- GoogleUtilities/MethodSwizzler (~> 7.6)
60-
- GoogleUtilities/Network (~> 7.6)
61-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
62-
- nanopb (~> 2.30908.0)
63-
- GoogleDataTransport (9.1.2):
64-
- GoogleUtilities/Environment (~> 7.2)
65-
- nanopb (~> 2.30908.0)
66-
- PromisesObjC (< 3.0, >= 1.2)
67-
- GoogleUtilities/AppDelegateSwizzler (7.7.0):
70+
- GoogleUtilities/AppDelegateSwizzler (7.8.0):
6871
- GoogleUtilities/Environment
6972
- GoogleUtilities/Logger
7073
- GoogleUtilities/Network
71-
- GoogleUtilities/Environment (7.7.0):
74+
- GoogleUtilities/Environment (7.8.0):
7275
- PromisesObjC (< 3.0, >= 1.2)
73-
- GoogleUtilities/Logger (7.7.0):
76+
- GoogleUtilities/Logger (7.8.0):
7477
- GoogleUtilities/Environment
75-
- GoogleUtilities/MethodSwizzler (7.7.0):
78+
- GoogleUtilities/MethodSwizzler (7.8.0):
7679
- GoogleUtilities/Logger
77-
- GoogleUtilities/Network (7.7.0):
80+
- GoogleUtilities/Network (7.8.0):
7881
- GoogleUtilities/Logger
7982
- "GoogleUtilities/NSData+zlib"
8083
- GoogleUtilities/Reachability
81-
- "GoogleUtilities/NSData+zlib (7.7.0)"
82-
- GoogleUtilities/Reachability (7.7.0):
84+
- "GoogleUtilities/NSData+zlib (7.8.0)"
85+
- GoogleUtilities/Reachability (7.8.0):
8386
- GoogleUtilities/Logger
84-
- GoogleUtilities/UserDefaults (7.7.0):
87+
- GoogleUtilities/UserDefaults (7.8.0):
8588
- GoogleUtilities/Logger
86-
- nanopb (2.30908.0):
87-
- nanopb/decode (= 2.30908.0)
88-
- nanopb/encode (= 2.30908.0)
89-
- nanopb/decode (2.30908.0)
90-
- nanopb/encode (2.30908.0)
89+
- nanopb (2.30909.0):
90+
- nanopb/decode (= 2.30909.0)
91+
- nanopb/encode (= 2.30909.0)
92+
- nanopb/decode (2.30909.0)
93+
- nanopb/encode (2.30909.0)
9194
- OCHamcrest (8.0.0)
9295
- OCMockito (6.0.0):
9396
- OCHamcrest (~> 8.0)
94-
- PromisesObjC (2.0.0)
95-
- Segment-Firebase (2.7.8):
97+
- PromisesObjC (2.1.1)
98+
- Segment-Firebase (2.7.10):
9699
- Analytics
97-
- Firebase (~> 8.7)
98-
- Firebase/Core (~> 8.7)
99-
- FirebaseAnalytics (~> 8.7)
100-
- Segment-Firebase/Core (= 2.7.8)
101-
- Segment-Firebase/Core (2.7.8):
100+
- Firebase (~> 9.6.0)
101+
- Firebase/Core (~> 9.6.0)
102+
- FirebaseAnalytics (~> 9.6.0)
103+
- Segment-Firebase/Core (= 2.7.10)
104+
- Segment-Firebase/Core (2.7.10):
102105
- Analytics
103-
- Firebase (~> 8.7)
104-
- Firebase/Core (~> 8.7)
105-
- FirebaseAnalytics (~> 8.7)
106-
- Specta (1.0.7)
106+
- Firebase (~> 9.6.0)
107+
- Firebase/Core (~> 9.6.0)
108+
- FirebaseAnalytics (~> 9.6.0)
109+
- Specta (2.0.0)
107110

108111
DEPENDENCIES:
109112
- Expecta
@@ -119,6 +122,7 @@ SPEC REPOS:
119122
- FirebaseAnalytics
120123
- FirebaseCore
121124
- FirebaseCoreDiagnostics
125+
- FirebaseCoreInternal
122126
- FirebaseInstallations
123127
- GoogleAppMeasurement
124128
- GoogleDataTransport
@@ -136,21 +140,22 @@ EXTERNAL SOURCES:
136140
SPEC CHECKSUMS:
137141
Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc
138142
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
139-
Firebase: 44213362f1dcc52555b935dc925ed35ac55f1b20
140-
FirebaseAnalytics: 319c9b3b1bdd400d60e2f415dff0c5f6959e6760
141-
FirebaseCore: 04186597c095da37d90ff9fd3e53bc61a1ff2440
142-
FirebaseCoreDiagnostics: 64d9709d804a6c25bd77841371c1fcfd909d5601
143-
FirebaseInstallations: 044eede8a049bce71c4541ee68d6e4364fcbe774
144-
GoogleAppMeasurement: a3311dbcf3ea651e5a070fe8559b57c174ada081
145-
GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940
146-
GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
147-
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
143+
Firebase: 5ae8b7cf8efce559a653aef0ad95bab3f427c351
144+
FirebaseAnalytics: 89ad762c6c3852a685794174757e2c60a36b6a82
145+
FirebaseCore: 2082fffcd855f95f883c0a1641133eb9bbe76d40
146+
FirebaseCoreDiagnostics: 99a495094b10a57eeb3ae8efa1665700ad0bdaa6
147+
FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3
148+
FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e
149+
GoogleAppMeasurement: 6de2b1a69e4326eb82ee05d138f6a5cb7311bcb1
150+
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
151+
GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7
152+
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
148153
OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5
149154
OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b
150-
PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
151-
Segment-Firebase: e4515bc7e36d5f0435d122a8c225c43db1504c02
152-
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
155+
PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
156+
Segment-Firebase: 36d699e36e7a2269476a9081bd2461d820e6fdd8
157+
Specta: b79d84043684b35ffdc2680df578dc318ec2efc2
153158

154-
PODFILE CHECKSUM: 6ed9d49cabf18e7f28eb6b1e1c6f84ce781f3324
159+
PODFILE CHECKSUM: 2c6ff7ca8d5b9826542864d0ab6166c58179de30
155160

156-
COCOAPODS: 1.11.2
161+
COCOAPODS: 1.11.3

‎Example/Segment-Firebase.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@
307307
"${BUILT_PRODUCTS_DIR}/Analytics/Segment.framework",
308308
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
309309
"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework",
310+
"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
310311
"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
311312
"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
312313
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
@@ -318,6 +319,7 @@
318319
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Segment.framework",
319320
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
320321
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
322+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
321323
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
322324
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
323325
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",

‎Example/Segment-Firebase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Example/Segment-Firebase/Main.storyboard‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="whP-gf-Uak">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
3+
<device id="retina6_7" orientation="portrait" appearance="light"/>
34
<dependencies>
45
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
7+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
68
</dependencies>
79
<scenes>
810
<!--View Controller-->
@@ -14,23 +16,27 @@
1416
<viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
1517
</layoutGuides>
1618
<view key="view" contentMode="scaleToFill" id="TpU-gO-2f1">
17-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
19+
<rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
1820
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1921
<subviews>
20-
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jod-eC-YEY">
21-
<rect key="frame" x="277" y="285" width="46" height="30"/>
22+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jod-eC-YEY">
23+
<rect key="frame" x="191" y="448" width="46" height="30"/>
2224
<state key="normal" title="Button"/>
2325
<connections>
2426
<action selector="buttonTouch:" destination="whP-gf-Uak" eventType="touchUpInside" id="kAu-Mk-TNM"/>
2527
</connections>
2628
</button>
2729
</subviews>
28-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
30+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
31+
<constraints>
32+
<constraint firstItem="jod-eC-YEY" firstAttribute="centerY" secondItem="TpU-gO-2f1" secondAttribute="centerY" id="6DG-mF-r2m"/>
33+
<constraint firstItem="jod-eC-YEY" firstAttribute="centerX" secondItem="TpU-gO-2f1" secondAttribute="centerX" id="VvS-52-EyH"/>
34+
</constraints>
2935
</view>
3036
</viewController>
3137
<placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>
3238
</objects>
3339
<point key="canvasLocation" x="305" y="433"/>
3440
</scene>
3541
</scenes>
36-
</document>
42+
</document>

‎Segment-Firebase.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ Pod::Spec.new do |s|
2424
s.static_framework = true
2525

2626
s.dependency 'Analytics'
27-
s.dependency 'Firebase', '~> 9.2.0'
28-
s.dependency 'Firebase/Core', '~> 9.2.0'
29-
s.dependency 'FirebaseAnalytics','~> 9.2.0'
27+
s.dependency 'Firebase', '~> 9.6.0'
28+
s.dependency 'Firebase/Core', '~> 9.6.0'
29+
s.dependency 'FirebaseAnalytics','~> 9.6.0'
3030

3131
s.subspec 'Core' do |core|
3232
#For users who only want the core Firebase package

0 commit comments

Comments
 (0)