Skip to content

Commit e3dde93

Browse files
daymxndaymxn
committed
Merge branch 'main' into dlr/add-live-audio
2 parents 52e4f54 + a1a38fa commit e3dde93

File tree

27 files changed

+897
-620
lines changed

27 files changed

+897
-620
lines changed

‎Gemfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.1.5.2)
8+
activesupport (7.1.6)
99
base64
1010
benchmark (>= 0.3)
1111
bigdecimal
@@ -25,8 +25,8 @@ GEM
2525
json (>= 1.5.1)
2626
atomos (0.1.3)
2727
base64 (0.3.0)
28-
benchmark (0.4.1)
29-
bigdecimal (3.2.3)
28+
benchmark (0.5.0)
29+
bigdecimal (3.3.1)
3030
claide (1.1.0)
3131
cocoapods (1.16.2)
3232
addressable (~> 2.8)
@@ -80,9 +80,9 @@ GEM
8080
mutex_m
8181
i18n (1.14.7)
8282
concurrent-ruby (~> 1.0)
83-
json (2.15.0)
83+
json (2.15.2)
8484
logger (1.7.0)
85-
minitest (5.25.5)
85+
minitest (5.26.0)
8686
molinillo (0.8.0)
8787
mutex_m (0.3.0)
8888
nanaimo (0.4.0)

‎abtesting/LegacyABTestingQuickstart/Podfile.lock‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
PODS:
2-
- FirebaseABTesting (12.3.0):
3-
- FirebaseCore (~> 12.3.0)
4-
- FirebaseAnalytics (12.3.0):
5-
- FirebaseAnalytics/Default (= 12.3.0)
6-
- FirebaseCore (~> 12.3.0)
7-
- FirebaseInstallations (~> 12.3.0)
2+
- FirebaseABTesting (12.5.0):
3+
- FirebaseCore (~> 12.5.0)
4+
- FirebaseAnalytics (12.5.0):
5+
- FirebaseAnalytics/Default (= 12.5.0)
6+
- FirebaseCore (~> 12.5.0)
7+
- FirebaseInstallations (~> 12.5.0)
88
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
99
- GoogleUtilities/MethodSwizzler (~> 8.1)
1010
- GoogleUtilities/Network (~> 8.1)
1111
- "GoogleUtilities/NSData+zlib (~> 8.1)"
1212
- nanopb (~> 3.30910.0)
13-
- FirebaseAnalytics/Default (12.3.0):
14-
- FirebaseCore (~> 12.3.0)
15-
- FirebaseInstallations (~> 12.3.0)
16-
- GoogleAppMeasurement/Default (= 12.3.0)
13+
- FirebaseAnalytics/Default (12.5.0):
14+
- FirebaseCore (~> 12.5.0)
15+
- FirebaseInstallations (~> 12.5.0)
16+
- GoogleAppMeasurement/Default (= 12.5.0)
1717
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
1818
- GoogleUtilities/MethodSwizzler (~> 8.1)
1919
- GoogleUtilities/Network (~> 8.1)
2020
- "GoogleUtilities/NSData+zlib (~> 8.1)"
2121
- nanopb (~> 3.30910.0)
22-
- FirebaseCore (12.3.0):
23-
- FirebaseCoreInternal (~> 12.3.0)
22+
- FirebaseCore (12.5.0):
23+
- FirebaseCoreInternal (~> 12.5.0)
2424
- GoogleUtilities/Environment (~> 8.1)
2525
- GoogleUtilities/Logger (~> 8.1)
26-
- FirebaseCoreInternal (12.3.0):
26+
- FirebaseCoreInternal (12.5.0):
2727
- "GoogleUtilities/NSData+zlib (~> 8.1)"
28-
- FirebaseInstallations (12.3.0):
29-
- FirebaseCore (~> 12.3.0)
28+
- FirebaseInstallations (12.5.0):
29+
- FirebaseCore (~> 12.5.0)
3030
- GoogleUtilities/Environment (~> 8.1)
3131
- GoogleUtilities/UserDefaults (~> 8.1)
3232
- PromisesObjC (~> 2.4)
33-
- FirebaseRemoteConfig (12.3.0):
34-
- FirebaseABTesting (~> 12.3.0)
35-
- FirebaseCore (~> 12.3.0)
36-
- FirebaseInstallations (~> 12.3.0)
37-
- FirebaseRemoteConfigInterop (~> 12.3.0)
38-
- FirebaseSharedSwift (~> 12.3.0)
33+
- FirebaseRemoteConfig (12.5.0):
34+
- FirebaseABTesting (~> 12.5.0)
35+
- FirebaseCore (~> 12.5.0)
36+
- FirebaseInstallations (~> 12.5.0)
37+
- FirebaseRemoteConfigInterop (~> 12.5.0)
38+
- FirebaseSharedSwift (~> 12.5.0)
3939
- GoogleUtilities/Environment (~> 8.1)
4040
- "GoogleUtilities/NSData+zlib (~> 8.1)"
41-
- FirebaseRemoteConfigInterop (12.3.0)
42-
- FirebaseSharedSwift (12.3.0)
43-
- GoogleAdsOnDeviceConversion (3.0.0):
41+
- FirebaseRemoteConfigInterop (12.5.0)
42+
- FirebaseSharedSwift (12.5.0)
43+
- GoogleAdsOnDeviceConversion (3.2.0):
4444
- GoogleUtilities/Environment (~> 8.1)
4545
- GoogleUtilities/Logger (~> 8.1)
4646
- GoogleUtilities/Network (~> 8.1)
4747
- nanopb (~> 3.30910.0)
48-
- GoogleAppMeasurement/Core (12.3.0):
48+
- GoogleAppMeasurement/Core (12.5.0):
4949
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5050
- GoogleUtilities/MethodSwizzler (~> 8.1)
5151
- GoogleUtilities/Network (~> 8.1)
5252
- "GoogleUtilities/NSData+zlib (~> 8.1)"
5353
- nanopb (~> 3.30910.0)
54-
- GoogleAppMeasurement/Default (12.3.0):
55-
- GoogleAdsOnDeviceConversion (~> 3.0.0)
56-
- GoogleAppMeasurement/Core (= 12.3.0)
57-
- GoogleAppMeasurement/IdentitySupport (= 12.3.0)
54+
- GoogleAppMeasurement/Default (12.5.0):
55+
- GoogleAdsOnDeviceConversion (~> 3.2.0)
56+
- GoogleAppMeasurement/Core (= 12.5.0)
57+
- GoogleAppMeasurement/IdentitySupport (= 12.5.0)
5858
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5959
- GoogleUtilities/MethodSwizzler (~> 8.1)
6060
- GoogleUtilities/Network (~> 8.1)
6161
- "GoogleUtilities/NSData+zlib (~> 8.1)"
6262
- nanopb (~> 3.30910.0)
63-
- GoogleAppMeasurement/IdentitySupport (12.3.0):
64-
- GoogleAppMeasurement/Core (= 12.3.0)
63+
- GoogleAppMeasurement/IdentitySupport (12.5.0):
64+
- GoogleAppMeasurement/Core (= 12.5.0)
6565
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
6666
- GoogleUtilities/MethodSwizzler (~> 8.1)
6767
- GoogleUtilities/Network (~> 8.1)
@@ -122,16 +122,16 @@ SPEC REPOS:
122122
- PromisesObjC
123123

124124
SPEC CHECKSUMS:
125-
FirebaseABTesting: 6e748dfecb81a49539c030adb5b12263acf62865
126-
FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae
127-
FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8
128-
FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf
129-
FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5
130-
FirebaseRemoteConfig: 4f4785cfc62e3e3b2f3715d1b7e41ade5ac0419e
131-
FirebaseRemoteConfigInterop: 66d61ad6cee1cd2137cb8dedf468112e9ba92c6a
132-
FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea
133-
GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261
134-
GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e
125+
FirebaseABTesting: e1e898b0820bd158af13113a54cfebb480349a1b
126+
FirebaseAnalytics: a49d86cd6f75bc9ff894943c36dc799a5a1a267d
127+
FirebaseCore: dcadd790e70df14d689525ee56657bf4a6305b54
128+
FirebaseCoreInternal: 67715d38ba28c92c10750de9367f4f2120d763cf
129+
FirebaseInstallations: a3208cb8ada31c7cc3e69d8fa9653561d9861169
130+
FirebaseRemoteConfig: 5b76b9846ea1606e255b9f30058c685725203f90
131+
FirebaseRemoteConfigInterop: 8d988e0ee2fd9b974dd4aaa78fc0aedf9860b1c3
132+
FirebaseSharedSwift: 9a96c0a083dad9cf12b9b2787a1fc9dda6470860
133+
GoogleAdsOnDeviceConversion: d68c69dd9581a0f5da02617b6f377e5be483970f
134+
GoogleAppMeasurement: 6c1731ca73cd25e7d6cf5396d95598242032317e
135135
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
136136
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
137137
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47

‎analytics/LegacyAnalyticsQuickstart/Podfile.lock‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
PODS:
2-
- FirebaseAnalytics (12.3.0):
3-
- FirebaseAnalytics/Default (= 12.3.0)
4-
- FirebaseCore (~> 12.3.0)
5-
- FirebaseInstallations (~> 12.3.0)
2+
- FirebaseAnalytics (12.5.0):
3+
- FirebaseAnalytics/Default (= 12.5.0)
4+
- FirebaseCore (~> 12.5.0)
5+
- FirebaseInstallations (~> 12.5.0)
66
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
77
- GoogleUtilities/MethodSwizzler (~> 8.1)
88
- GoogleUtilities/Network (~> 8.1)
99
- "GoogleUtilities/NSData+zlib (~> 8.1)"
1010
- nanopb (~> 3.30910.0)
11-
- FirebaseAnalytics/Default (12.3.0):
12-
- FirebaseCore (~> 12.3.0)
13-
- FirebaseInstallations (~> 12.3.0)
14-
- GoogleAppMeasurement/Default (= 12.3.0)
11+
- FirebaseAnalytics/Default (12.5.0):
12+
- FirebaseCore (~> 12.5.0)
13+
- FirebaseInstallations (~> 12.5.0)
14+
- GoogleAppMeasurement/Default (= 12.5.0)
1515
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
1616
- GoogleUtilities/MethodSwizzler (~> 8.1)
1717
- GoogleUtilities/Network (~> 8.1)
1818
- "GoogleUtilities/NSData+zlib (~> 8.1)"
1919
- nanopb (~> 3.30910.0)
20-
- FirebaseCore (12.3.0):
21-
- FirebaseCoreInternal (~> 12.3.0)
20+
- FirebaseCore (12.5.0):
21+
- FirebaseCoreInternal (~> 12.5.0)
2222
- GoogleUtilities/Environment (~> 8.1)
2323
- GoogleUtilities/Logger (~> 8.1)
24-
- FirebaseCoreInternal (12.3.0):
24+
- FirebaseCoreInternal (12.5.0):
2525
- "GoogleUtilities/NSData+zlib (~> 8.1)"
26-
- FirebaseInstallations (12.3.0):
27-
- FirebaseCore (~> 12.3.0)
26+
- FirebaseInstallations (12.5.0):
27+
- FirebaseCore (~> 12.5.0)
2828
- GoogleUtilities/Environment (~> 8.1)
2929
- GoogleUtilities/UserDefaults (~> 8.1)
3030
- PromisesObjC (~> 2.4)
31-
- GoogleAdsOnDeviceConversion (3.0.0):
31+
- GoogleAdsOnDeviceConversion (3.2.0):
3232
- GoogleUtilities/Environment (~> 8.1)
3333
- GoogleUtilities/Logger (~> 8.1)
3434
- GoogleUtilities/Network (~> 8.1)
3535
- nanopb (~> 3.30910.0)
36-
- GoogleAppMeasurement/Core (12.3.0):
36+
- GoogleAppMeasurement/Core (12.5.0):
3737
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
3838
- GoogleUtilities/MethodSwizzler (~> 8.1)
3939
- GoogleUtilities/Network (~> 8.1)
4040
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4141
- nanopb (~> 3.30910.0)
42-
- GoogleAppMeasurement/Default (12.3.0):
43-
- GoogleAdsOnDeviceConversion (~> 3.0.0)
44-
- GoogleAppMeasurement/Core (= 12.3.0)
45-
- GoogleAppMeasurement/IdentitySupport (= 12.3.0)
42+
- GoogleAppMeasurement/Default (12.5.0):
43+
- GoogleAdsOnDeviceConversion (~> 3.2.0)
44+
- GoogleAppMeasurement/Core (= 12.5.0)
45+
- GoogleAppMeasurement/IdentitySupport (= 12.5.0)
4646
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4747
- GoogleUtilities/MethodSwizzler (~> 8.1)
4848
- GoogleUtilities/Network (~> 8.1)
4949
- "GoogleUtilities/NSData+zlib (~> 8.1)"
5050
- nanopb (~> 3.30910.0)
51-
- GoogleAppMeasurement/IdentitySupport (12.3.0):
52-
- GoogleAppMeasurement/Core (= 12.3.0)
51+
- GoogleAppMeasurement/IdentitySupport (12.5.0):
52+
- GoogleAppMeasurement/Core (= 12.5.0)
5353
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5454
- GoogleUtilities/MethodSwizzler (~> 8.1)
5555
- GoogleUtilities/Network (~> 8.1)
@@ -105,12 +105,12 @@ SPEC REPOS:
105105
- PromisesObjC
106106

107107
SPEC CHECKSUMS:
108-
FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae
109-
FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8
110-
FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf
111-
FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5
112-
GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261
113-
GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e
108+
FirebaseAnalytics: a49d86cd6f75bc9ff894943c36dc799a5a1a267d
109+
FirebaseCore: dcadd790e70df14d689525ee56657bf4a6305b54
110+
FirebaseCoreInternal: 67715d38ba28c92c10750de9367f4f2120d763cf
111+
FirebaseInstallations: a3208cb8ada31c7cc3e69d8fa9653561d9861169
112+
GoogleAdsOnDeviceConversion: d68c69dd9581a0f5da02617b6f377e5be483970f
113+
GoogleAppMeasurement: 6c1731ca73cd25e7d6cf5396d95598242032317e
114114
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
115115
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
116116
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47

‎analytics/Podfile.lock‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
PODS:
2-
- FirebaseAnalytics (12.3.0):
3-
- FirebaseAnalytics/Default (= 12.3.0)
4-
- FirebaseCore (~> 12.3.0)
5-
- FirebaseInstallations (~> 12.3.0)
2+
- FirebaseAnalytics (12.5.0):
3+
- FirebaseAnalytics/Default (= 12.5.0)
4+
- FirebaseCore (~> 12.5.0)
5+
- FirebaseInstallations (~> 12.5.0)
66
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
77
- GoogleUtilities/MethodSwizzler (~> 8.1)
88
- GoogleUtilities/Network (~> 8.1)
99
- "GoogleUtilities/NSData+zlib (~> 8.1)"
1010
- nanopb (~> 3.30910.0)
11-
- FirebaseAnalytics/Default (12.3.0):
12-
- FirebaseCore (~> 12.3.0)
13-
- FirebaseInstallations (~> 12.3.0)
14-
- GoogleAppMeasurement/Default (= 12.3.0)
11+
- FirebaseAnalytics/Default (12.5.0):
12+
- FirebaseCore (~> 12.5.0)
13+
- FirebaseInstallations (~> 12.5.0)
14+
- GoogleAppMeasurement/Default (= 12.5.0)
1515
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
1616
- GoogleUtilities/MethodSwizzler (~> 8.1)
1717
- GoogleUtilities/Network (~> 8.1)
1818
- "GoogleUtilities/NSData+zlib (~> 8.1)"
1919
- nanopb (~> 3.30910.0)
20-
- FirebaseCore (12.3.0):
21-
- FirebaseCoreInternal (~> 12.3.0)
20+
- FirebaseCore (12.5.0):
21+
- FirebaseCoreInternal (~> 12.5.0)
2222
- GoogleUtilities/Environment (~> 8.1)
2323
- GoogleUtilities/Logger (~> 8.1)
24-
- FirebaseCoreInternal (12.3.0):
24+
- FirebaseCoreInternal (12.5.0):
2525
- "GoogleUtilities/NSData+zlib (~> 8.1)"
26-
- FirebaseInstallations (12.3.0):
27-
- FirebaseCore (~> 12.3.0)
26+
- FirebaseInstallations (12.5.0):
27+
- FirebaseCore (~> 12.5.0)
2828
- GoogleUtilities/Environment (~> 8.1)
2929
- GoogleUtilities/UserDefaults (~> 8.1)
3030
- PromisesObjC (~> 2.4)
31-
- GoogleAdsOnDeviceConversion (3.0.0):
31+
- GoogleAdsOnDeviceConversion (3.2.0):
3232
- GoogleUtilities/Environment (~> 8.1)
3333
- GoogleUtilities/Logger (~> 8.1)
3434
- GoogleUtilities/Network (~> 8.1)
3535
- nanopb (~> 3.30910.0)
36-
- GoogleAppMeasurement/Core (12.3.0):
36+
- GoogleAppMeasurement/Core (12.5.0):
3737
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
3838
- GoogleUtilities/MethodSwizzler (~> 8.1)
3939
- GoogleUtilities/Network (~> 8.1)
4040
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4141
- nanopb (~> 3.30910.0)
42-
- GoogleAppMeasurement/Default (12.3.0):
43-
- GoogleAdsOnDeviceConversion (~> 3.0.0)
44-
- GoogleAppMeasurement/Core (= 12.3.0)
45-
- GoogleAppMeasurement/IdentitySupport (= 12.3.0)
42+
- GoogleAppMeasurement/Default (12.5.0):
43+
- GoogleAdsOnDeviceConversion (~> 3.2.0)
44+
- GoogleAppMeasurement/Core (= 12.5.0)
45+
- GoogleAppMeasurement/IdentitySupport (= 12.5.0)
4646
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4747
- GoogleUtilities/MethodSwizzler (~> 8.1)
4848
- GoogleUtilities/Network (~> 8.1)
4949
- "GoogleUtilities/NSData+zlib (~> 8.1)"
5050
- nanopb (~> 3.30910.0)
51-
- GoogleAppMeasurement/IdentitySupport (12.3.0):
52-
- GoogleAppMeasurement/Core (= 12.3.0)
51+
- GoogleAppMeasurement/IdentitySupport (12.5.0):
52+
- GoogleAppMeasurement/Core (= 12.5.0)
5353
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5454
- GoogleUtilities/MethodSwizzler (~> 8.1)
5555
- GoogleUtilities/Network (~> 8.1)
@@ -105,12 +105,12 @@ SPEC REPOS:
105105
- PromisesObjC
106106

107107
SPEC CHECKSUMS:
108-
FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae
109-
FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8
110-
FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf
111-
FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5
112-
GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261
113-
GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e
108+
FirebaseAnalytics: a49d86cd6f75bc9ff894943c36dc799a5a1a267d
109+
FirebaseCore: dcadd790e70df14d689525ee56657bf4a6305b54
110+
FirebaseCoreInternal: 67715d38ba28c92c10750de9367f4f2120d763cf
111+
FirebaseInstallations: a3208cb8ada31c7cc3e69d8fa9653561d9861169
112+
GoogleAdsOnDeviceConversion: d68c69dd9581a0f5da02617b6f377e5be483970f
113+
GoogleAppMeasurement: 6c1731ca73cd25e7d6cf5396d95598242032317e
114114
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
115115
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
116116
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47

0 commit comments

Comments
 (0)