Skip to content

Commit d5132bd

Browse files
paulb777paulb777
authored
Fix Messaging Swift build regression (#1139)
1 parent dc40c86 commit d5132bd

File tree

3 files changed

+56
-50
lines changed

3 files changed

+56
-50
lines changed

‎.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ matrix:
3434
env: SAMPLE=Firestore
3535
- podfile: functions/Podfile
3636
env: SAMPLE=Functions
37-
- podfile: messaging/Podfile
38-
env: SAMPLE=InAppMessaging
3937
- podfile: inappmessaging/Podfile
38+
env: SAMPLE=InAppMessaging
39+
- podfile: messaging/Podfile
4040
env: SAMPLE=Messaging
41+
- podfile: messaging/Podfile
42+
env:
43+
- SAMPLE=Messaging
44+
- SWIFT_SUFFIX=Swift
4145
- podfile: performance/Podfile
4246
env: SAMPLE=Performance
4347
- podfile: storage/Podfile

‎messaging/MessagingExampleSwift/ViewController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class ViewController: UIViewController {
3939
Messaging.messaging().token { (token, error) in
4040
if let error = error {
4141
print("Error fetching remote FCM registration token: \(error)")
42-
} else if let result = result {
43-
print("Remote instance ID token: \(result.token)")
44-
self.remoteFCMTokenMessage.text = "Remote FCM registration token: \(result.token)"
42+
} else if let token = token {
43+
print("Remote instance ID token: \(token)")
44+
self.remoteFCMTokenMessage.text = "Remote FCM registration token: \(token)"
4545
}
4646
}
4747
// [END log_iid_reg_token]

‎messaging/Podfile.lock

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,83 @@
11
PODS:
2-
- Firebase/Analytics (7.4.0):
2+
- Firebase/Analytics (7.10.0):
33
- Firebase/Core
4-
- Firebase/Core (7.4.0):
4+
- Firebase/Core (7.10.0):
55
- Firebase/CoreOnly
6-
- FirebaseAnalytics (= 7.4.0)
7-
- Firebase/CoreOnly (7.4.0):
8-
- FirebaseCore (= 7.4.0)
9-
- Firebase/Messaging (7.4.0):
6+
- FirebaseAnalytics (~> 7.10.0)
7+
- Firebase/CoreOnly (7.10.0):
8+
- FirebaseCore (= 7.10.0)
9+
- Firebase/Messaging (7.10.0):
1010
- Firebase/CoreOnly
11-
- FirebaseMessaging (~> 7.4.0)
12-
- FirebaseAnalytics (7.4.0):
11+
- FirebaseMessaging (~> 7.10.0)
12+
- FirebaseAnalytics (7.10.0):
1313
- FirebaseCore (~> 7.0)
1414
- FirebaseInstallations (~> 7.0)
15-
- GoogleAppMeasurement (= 7.4.0)
15+
- GoogleAppMeasurement (= 7.10.0)
1616
- GoogleUtilities/AppDelegateSwizzler (~> 7.0)
1717
- GoogleUtilities/MethodSwizzler (~> 7.0)
1818
- GoogleUtilities/Network (~> 7.0)
1919
- "GoogleUtilities/NSData+zlib (~> 7.0)"
20-
- nanopb (~> 2.30907.0)
21-
- FirebaseCore (7.4.0):
20+
- nanopb (~> 2.30908.0)
21+
- FirebaseCore (7.10.0):
2222
- FirebaseCoreDiagnostics (~> 7.4)
2323
- GoogleUtilities/Environment (~> 7.0)
2424
- GoogleUtilities/Logger (~> 7.0)
25-
- FirebaseCoreDiagnostics (7.4.0):
26-
- GoogleDataTransport (~> 8.0)
25+
- FirebaseCoreDiagnostics (7.10.0):
26+
- GoogleDataTransport (~> 8.4)
2727
- GoogleUtilities/Environment (~> 7.0)
2828
- GoogleUtilities/Logger (~> 7.0)
29-
- nanopb (~> 2.30907.0)
30-
- FirebaseInstallations (7.4.0):
29+
- nanopb (~> 2.30908.0)
30+
- FirebaseInstallations (7.10.0):
3131
- FirebaseCore (~> 7.0)
3232
- GoogleUtilities/Environment (~> 7.0)
3333
- GoogleUtilities/UserDefaults (~> 7.0)
3434
- PromisesObjC (~> 1.2)
35-
- FirebaseInstanceID (7.4.0):
35+
- FirebaseInstanceID (7.10.0):
3636
- FirebaseCore (~> 7.0)
3737
- FirebaseInstallations (~> 7.0)
3838
- GoogleUtilities/Environment (~> 7.0)
3939
- GoogleUtilities/UserDefaults (~> 7.0)
40-
- FirebaseMessaging (7.4.0):
40+
- FirebaseMessaging (7.10.0):
4141
- FirebaseCore (~> 7.0)
4242
- FirebaseInstanceID (~> 7.0)
4343
- GoogleUtilities/AppDelegateSwizzler (~> 7.0)
4444
- GoogleUtilities/Environment (~> 7.0)
4545
- GoogleUtilities/Reachability (~> 7.0)
4646
- GoogleUtilities/UserDefaults (~> 7.0)
47-
- GoogleAppMeasurement (7.4.0):
47+
- GoogleAppMeasurement (7.10.0):
4848
- GoogleUtilities/AppDelegateSwizzler (~> 7.0)
4949
- GoogleUtilities/MethodSwizzler (~> 7.0)
5050
- GoogleUtilities/Network (~> 7.0)
5151
- "GoogleUtilities/NSData+zlib (~> 7.0)"
52-
- nanopb (~> 2.30907.0)
53-
- GoogleDataTransport (8.2.0):
54-
- nanopb (~> 2.30907.0)
55-
- GoogleUtilities/AppDelegateSwizzler (7.2.0):
52+
- nanopb (~> 2.30908.0)
53+
- GoogleDataTransport (8.4.0):
54+
- GoogleUtilities/Environment (~> 7.2)
55+
- nanopb (~> 2.30908.0)
56+
- PromisesObjC (~> 1.2)
57+
- GoogleUtilities/AppDelegateSwizzler (7.3.1):
5658
- GoogleUtilities/Environment
5759
- GoogleUtilities/Logger
5860
- GoogleUtilities/Network
59-
- GoogleUtilities/Environment (7.2.0):
61+
- GoogleUtilities/Environment (7.3.1):
6062
- PromisesObjC (~> 1.2)
61-
- GoogleUtilities/Logger (7.2.0):
63+
- GoogleUtilities/Logger (7.3.1):
6264
- GoogleUtilities/Environment
63-
- GoogleUtilities/MethodSwizzler (7.2.0):
65+
- GoogleUtilities/MethodSwizzler (7.3.1):
6466
- GoogleUtilities/Logger
65-
- GoogleUtilities/Network (7.2.0):
67+
- GoogleUtilities/Network (7.3.1):
6668
- GoogleUtilities/Logger
6769
- "GoogleUtilities/NSData+zlib"
6870
- GoogleUtilities/Reachability
69-
- "GoogleUtilities/NSData+zlib (7.2.0)"
70-
- GoogleUtilities/Reachability (7.2.0):
71+
- "GoogleUtilities/NSData+zlib (7.3.1)"
72+
- GoogleUtilities/Reachability (7.3.1):
7173
- GoogleUtilities/Logger
72-
- GoogleUtilities/UserDefaults (7.2.0):
74+
- GoogleUtilities/UserDefaults (7.3.1):
7375
- GoogleUtilities/Logger
74-
- nanopb (2.30907.0):
75-
- nanopb/decode (= 2.30907.0)
76-
- nanopb/encode (= 2.30907.0)
77-
- nanopb/decode (2.30907.0)
78-
- nanopb/encode (2.30907.0)
76+
- nanopb (2.30908.0):
77+
- nanopb/decode (= 2.30908.0)
78+
- nanopb/encode (= 2.30908.0)
79+
- nanopb/decode (2.30908.0)
80+
- nanopb/encode (2.30908.0)
7981
- PromisesObjC (1.2.12)
8082

8183
DEPENDENCIES:
@@ -98,17 +100,17 @@ SPEC REPOS:
98100
- PromisesObjC
99101

100102
SPEC CHECKSUMS:
101-
Firebase: 09fb40287b6dfc8ee65f726fa0b788719d3f2a07
102-
FirebaseAnalytics: adb3c8f02f83d00661cdaac6dbb4d54e9720d1b6
103-
FirebaseCore: 99c06e5a1e8d6952e75cb1f0a6d0b23c0f5ccdcf
104-
FirebaseCoreDiagnostics: 3770093ac4f2be4590fa03cfa1d3a6e5602d4557
105-
FirebaseInstallations: 30646fc9a61c6f4ee3cd7a8b7231721842b40c95
106-
FirebaseInstanceID: 46d93d287108246fabbd85371ca27141d2c21ff9
107-
FirebaseMessaging: 6112b5cd04e0ff58c4a9920e5e29cf193ea88439
108-
GoogleAppMeasurement: 688d7f00e2894d9e13823ed9a028b13b993bc277
109-
GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4
110-
GoogleUtilities: d866834472f1324d080496bc67ab3ce5d0d46027
111-
nanopb: 59221d7f958fb711001e6a449489542d92ae113e
103+
Firebase: fffddd0bab8677d07376538365faa93ff3889b39
104+
FirebaseAnalytics: 4641d7ae4220174f6ca5626163ffc5de2e90391e
105+
FirebaseCore: ec566d917b2195fc2610aeb148dae99f57a788f9
106+
FirebaseCoreDiagnostics: 5662a3823ffcc0acbaa9a21ba5ed302fac634705
107+
FirebaseInstallations: bf2ec8dbf36ff4c91af6b9a003d15855757680c1
108+
FirebaseInstanceID: 5ad92c898e1328b66e8dd58811964d6fe4d334c3
109+
FirebaseMessaging: 76b3058cef7f339cf10db196e03bbbb2165fb5d7
110+
GoogleAppMeasurement: 1c863b1161fc3c8cf614a7460d1be6a7c262aab3
111+
GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
112+
GoogleUtilities: e1d9ed4e544fc32a93e00e721400cbc3f377200d
113+
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
112114
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
113115

114116
PODFILE CHECKSUM: cb05c6a135b4dd51af6f4fef875e7004965ad0ce

0 commit comments

Comments
 (0)