Skip to content

Commit 4e96db2

Browse files
YoungHypoYoungHypo
authored
Merge branch 'main' into fix-imagescreen-ui
2 parents e105b4d + a72d3fe commit 4e96db2

File tree

34 files changed

+970
-707
lines changed

34 files changed

+970
-707
lines changed

‎Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ GEM
8080
mutex_m
8181
i18n (1.14.7)
8282
concurrent-ruby (~> 1.0)
83-
json (2.12.2)
83+
json (2.13.1)
8484
logger (1.7.0)
8585
minitest (5.25.5)
8686
molinillo (0.8.0)

‎abtesting/LegacyABTestingQuickstart/Podfile.lock‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
PODS:
2-
- FirebaseABTesting (11.14.0):
3-
- FirebaseCore (~> 11.14.0)
4-
- FirebaseAnalytics (11.14.0):
5-
- FirebaseAnalytics/Default (= 11.14.0)
6-
- FirebaseCore (~> 11.14.0)
7-
- FirebaseInstallations (~> 11.0)
2+
- FirebaseABTesting (12.0.0):
3+
- FirebaseCore (~> 12.0.0)
4+
- FirebaseAnalytics (12.0.0):
5+
- FirebaseAnalytics/Default (= 12.0.0)
6+
- FirebaseCore (~> 12.0.0)
7+
- FirebaseInstallations (~> 12.0.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 (11.14.0):
14-
- FirebaseCore (~> 11.14.0)
15-
- FirebaseInstallations (~> 11.0)
16-
- GoogleAppMeasurement/Default (= 11.14.0)
13+
- FirebaseAnalytics/Default (12.0.0):
14+
- FirebaseCore (~> 12.0.0)
15+
- FirebaseInstallations (~> 12.0.0)
16+
- GoogleAppMeasurement/Default (= 12.0.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 (11.14.0):
23-
- FirebaseCoreInternal (~> 11.14.0)
22+
- FirebaseCore (12.0.0):
23+
- FirebaseCoreInternal (~> 12.0.0)
2424
- GoogleUtilities/Environment (~> 8.1)
2525
- GoogleUtilities/Logger (~> 8.1)
26-
- FirebaseCoreInternal (11.14.0):
26+
- FirebaseCoreInternal (12.0.0):
2727
- "GoogleUtilities/NSData+zlib (~> 8.1)"
28-
- FirebaseInstallations (11.14.0):
29-
- FirebaseCore (~> 11.14.0)
28+
- FirebaseInstallations (12.0.0):
29+
- FirebaseCore (~> 12.0.0)
3030
- GoogleUtilities/Environment (~> 8.1)
3131
- GoogleUtilities/UserDefaults (~> 8.1)
3232
- PromisesObjC (~> 2.4)
33-
- FirebaseRemoteConfig (11.14.0):
34-
- FirebaseABTesting (~> 11.0)
35-
- FirebaseCore (~> 11.14.0)
36-
- FirebaseInstallations (~> 11.0)
37-
- FirebaseRemoteConfigInterop (~> 11.0)
38-
- FirebaseSharedSwift (~> 11.0)
33+
- FirebaseRemoteConfig (12.0.0):
34+
- FirebaseABTesting (~> 12.0.0)
35+
- FirebaseCore (~> 12.0.0)
36+
- FirebaseInstallations (~> 12.0.0)
37+
- FirebaseRemoteConfigInterop (~> 12.0.0)
38+
- FirebaseSharedSwift (~> 12.0.0)
3939
- GoogleUtilities/Environment (~> 8.1)
4040
- "GoogleUtilities/NSData+zlib (~> 8.1)"
41-
- FirebaseRemoteConfigInterop (11.14.0)
42-
- FirebaseSharedSwift (11.14.0)
43-
- GoogleAdsOnDeviceConversion (2.0.0):
41+
- FirebaseRemoteConfigInterop (12.0.0)
42+
- FirebaseSharedSwift (12.0.0)
43+
- GoogleAdsOnDeviceConversion (2.1.0):
4444
- GoogleUtilities/Logger (~> 8.1)
4545
- GoogleUtilities/Network (~> 8.1)
4646
- nanopb (~> 3.30910.0)
47-
- GoogleAppMeasurement/Core (11.14.0):
47+
- GoogleAppMeasurement/Core (12.0.0):
4848
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4949
- GoogleUtilities/MethodSwizzler (~> 8.1)
5050
- GoogleUtilities/Network (~> 8.1)
5151
- "GoogleUtilities/NSData+zlib (~> 8.1)"
5252
- nanopb (~> 3.30910.0)
53-
- GoogleAppMeasurement/Default (11.14.0):
54-
- GoogleAdsOnDeviceConversion (= 2.0.0)
55-
- GoogleAppMeasurement/Core (= 11.14.0)
56-
- GoogleAppMeasurement/IdentitySupport (= 11.14.0)
53+
- GoogleAppMeasurement/Default (12.0.0):
54+
- GoogleAdsOnDeviceConversion (= 2.1.0)
55+
- GoogleAppMeasurement/Core (= 12.0.0)
56+
- GoogleAppMeasurement/IdentitySupport (= 12.0.0)
5757
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5858
- GoogleUtilities/MethodSwizzler (~> 8.1)
5959
- GoogleUtilities/Network (~> 8.1)
6060
- "GoogleUtilities/NSData+zlib (~> 8.1)"
6161
- nanopb (~> 3.30910.0)
62-
- GoogleAppMeasurement/IdentitySupport (11.14.0):
63-
- GoogleAppMeasurement/Core (= 11.14.0)
62+
- GoogleAppMeasurement/IdentitySupport (12.0.0):
63+
- GoogleAppMeasurement/Core (= 12.0.0)
6464
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
6565
- GoogleUtilities/MethodSwizzler (~> 8.1)
6666
- GoogleUtilities/Network (~> 8.1)
@@ -121,20 +121,20 @@ SPEC REPOS:
121121
- PromisesObjC
122122

123123
SPEC CHECKSUMS:
124-
FirebaseABTesting: 13de5629e6d92a6a6c06429a6ddd9b19362de827
125-
FirebaseAnalytics: d604dc875290f0213b9ead8a4692cf1e91e024d9
126-
FirebaseCore: 8fb12caed934c900218ce66a419107db74214ade
127-
FirebaseCoreInternal: 6a3b668197644aa858fc4127578637c6767ba123
128-
FirebaseInstallations: 863f2846bb124331b501d29c0f17f95caa2ef6bb
129-
FirebaseRemoteConfig: ded3fce28a1ba2bd339ff179e726211a06f05a0b
130-
FirebaseRemoteConfigInterop: 7b74ceaa54e28863ed17fa39da8951692725eced
131-
FirebaseSharedSwift: bdd5c8674c4712a98e70287c936bc5cca5d640f6
132-
GoogleAdsOnDeviceConversion: 5c3c8de58786e7d0a4bdecbd32c16f87d815cc9f
133-
GoogleAppMeasurement: 078fe9bfeed8e398253772ce81ef8690b0413b45
124+
FirebaseABTesting: 2cad22e464cd7ef4589ae29f897bc71ff83ce83b
125+
FirebaseAnalytics: 6d790cd1b159b4eb61a99948df0934ce505a34f7
126+
FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a
127+
FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55
128+
FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
129+
FirebaseRemoteConfig: 4cbbe0083474359025e7bb334b9d0cff16b78d3a
130+
FirebaseRemoteConfigInterop: bfa0ea72ba3dc5af739777296424e46bd6f42613
131+
FirebaseSharedSwift: 59266c22ccfcef604d725c034c568fa666ea9bda
132+
GoogleAdsOnDeviceConversion: 2be6297a4f048459e0ae17fad9bfd2844e10cf64
133+
GoogleAppMeasurement: 8f6ab04ad6ae493b53fcf56bd26323fb2f1384f3
134134
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
135135
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
136136
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
137137

138-
PODFILE CHECKSUM: e4f79ac7e1a15a7e65e25ee8317b4931ef16941d
138+
PODFILE CHECKSUM: 46f08f1667aa6efa2162f0fe0fe92bd33c239dd7
139139

140140
COCOAPODS: 1.16.2

‎analytics/LegacyAnalyticsQuickstart/Podfile.lock‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
PODS:
2-
- FirebaseAnalytics (11.14.0):
3-
- FirebaseAnalytics/Default (= 11.14.0)
4-
- FirebaseCore (~> 11.14.0)
5-
- FirebaseInstallations (~> 11.0)
2+
- FirebaseAnalytics (12.0.0):
3+
- FirebaseAnalytics/Default (= 12.0.0)
4+
- FirebaseCore (~> 12.0.0)
5+
- FirebaseInstallations (~> 12.0.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 (11.14.0):
12-
- FirebaseCore (~> 11.14.0)
13-
- FirebaseInstallations (~> 11.0)
14-
- GoogleAppMeasurement/Default (= 11.14.0)
11+
- FirebaseAnalytics/Default (12.0.0):
12+
- FirebaseCore (~> 12.0.0)
13+
- FirebaseInstallations (~> 12.0.0)
14+
- GoogleAppMeasurement/Default (= 12.0.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 (11.14.0):
21-
- FirebaseCoreInternal (~> 11.14.0)
20+
- FirebaseCore (12.0.0):
21+
- FirebaseCoreInternal (~> 12.0.0)
2222
- GoogleUtilities/Environment (~> 8.1)
2323
- GoogleUtilities/Logger (~> 8.1)
24-
- FirebaseCoreInternal (11.14.0):
24+
- FirebaseCoreInternal (12.0.0):
2525
- "GoogleUtilities/NSData+zlib (~> 8.1)"
26-
- FirebaseInstallations (11.14.0):
27-
- FirebaseCore (~> 11.14.0)
26+
- FirebaseInstallations (12.0.0):
27+
- FirebaseCore (~> 12.0.0)
2828
- GoogleUtilities/Environment (~> 8.1)
2929
- GoogleUtilities/UserDefaults (~> 8.1)
3030
- PromisesObjC (~> 2.4)
31-
- GoogleAdsOnDeviceConversion (2.0.0):
31+
- GoogleAdsOnDeviceConversion (2.1.0):
3232
- GoogleUtilities/Logger (~> 8.1)
3333
- GoogleUtilities/Network (~> 8.1)
3434
- nanopb (~> 3.30910.0)
35-
- GoogleAppMeasurement/Core (11.14.0):
35+
- GoogleAppMeasurement/Core (12.0.0):
3636
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
3737
- GoogleUtilities/MethodSwizzler (~> 8.1)
3838
- GoogleUtilities/Network (~> 8.1)
3939
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4040
- nanopb (~> 3.30910.0)
41-
- GoogleAppMeasurement/Default (11.14.0):
42-
- GoogleAdsOnDeviceConversion (= 2.0.0)
43-
- GoogleAppMeasurement/Core (= 11.14.0)
44-
- GoogleAppMeasurement/IdentitySupport (= 11.14.0)
41+
- GoogleAppMeasurement/Default (12.0.0):
42+
- GoogleAdsOnDeviceConversion (= 2.1.0)
43+
- GoogleAppMeasurement/Core (= 12.0.0)
44+
- GoogleAppMeasurement/IdentitySupport (= 12.0.0)
4545
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4646
- GoogleUtilities/MethodSwizzler (~> 8.1)
4747
- GoogleUtilities/Network (~> 8.1)
4848
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4949
- nanopb (~> 3.30910.0)
50-
- GoogleAppMeasurement/IdentitySupport (11.14.0):
51-
- GoogleAppMeasurement/Core (= 11.14.0)
50+
- GoogleAppMeasurement/IdentitySupport (12.0.0):
51+
- GoogleAppMeasurement/Core (= 12.0.0)
5252
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5353
- GoogleUtilities/MethodSwizzler (~> 8.1)
5454
- GoogleUtilities/Network (~> 8.1)
@@ -104,16 +104,16 @@ SPEC REPOS:
104104
- PromisesObjC
105105

106106
SPEC CHECKSUMS:
107-
FirebaseAnalytics: d604dc875290f0213b9ead8a4692cf1e91e024d9
108-
FirebaseCore: 8fb12caed934c900218ce66a419107db74214ade
109-
FirebaseCoreInternal: 6a3b668197644aa858fc4127578637c6767ba123
110-
FirebaseInstallations: 863f2846bb124331b501d29c0f17f95caa2ef6bb
111-
GoogleAdsOnDeviceConversion: 5c3c8de58786e7d0a4bdecbd32c16f87d815cc9f
112-
GoogleAppMeasurement: 078fe9bfeed8e398253772ce81ef8690b0413b45
107+
FirebaseAnalytics: 6d790cd1b159b4eb61a99948df0934ce505a34f7
108+
FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a
109+
FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55
110+
FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
111+
GoogleAdsOnDeviceConversion: 2be6297a4f048459e0ae17fad9bfd2844e10cf64
112+
GoogleAppMeasurement: 8f6ab04ad6ae493b53fcf56bd26323fb2f1384f3
113113
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
114114
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
115115
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
116116

117-
PODFILE CHECKSUM: 815d90061e0c42b19744cb672320849abcaf83bf
117+
PODFILE CHECKSUM: 9092820812ba08f8312f6f0c9577dd8d312ea8b3
118118

119119
COCOAPODS: 1.16.2

‎analytics/Podfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,20 @@ target 'AnalyticsExampleTV' do
3838
# Pods for testing
3939
end
4040
end
41+
42+
post_install do |installer|
43+
installer.pods_project.targets.each do |target|
44+
if target.name == "Pods-AnalyticsExample"
45+
puts "Updating #{target.name} to include GoogleAdsOnDeviceConversion for iPhone only"
46+
target.build_configurations.each do |config|
47+
xcconfig_path = config.base_configuration_reference.real_path
48+
xcconfig = File.read(xcconfig_path)
49+
xcconfig =~ /OTHER_LDFLAGS = (.+)/
50+
other_ld_flags = "#{$1}"
51+
xcconfig.sub!('-framework "GoogleAdsOnDeviceConversion"', '')
52+
new_xcconfig = xcconfig + "OTHER_LDFLAGS[sdk=iphone*] = #{other_ld_flags}"
53+
File.open(xcconfig_path, "w") { |file| file << new_xcconfig }
54+
end
55+
end
56+
end
57+
end

‎analytics/Podfile.lock‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
PODS:
2-
- FirebaseAnalytics (11.14.0):
3-
- FirebaseAnalytics/Default (= 11.14.0)
4-
- FirebaseCore (~> 11.14.0)
5-
- FirebaseInstallations (~> 11.0)
2+
- FirebaseAnalytics (12.0.0):
3+
- FirebaseAnalytics/Default (= 12.0.0)
4+
- FirebaseCore (~> 12.0.0)
5+
- FirebaseInstallations (~> 12.0.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 (11.14.0):
12-
- FirebaseCore (~> 11.14.0)
13-
- FirebaseInstallations (~> 11.0)
14-
- GoogleAppMeasurement/Default (= 11.14.0)
11+
- FirebaseAnalytics/Default (12.0.0):
12+
- FirebaseCore (~> 12.0.0)
13+
- FirebaseInstallations (~> 12.0.0)
14+
- GoogleAppMeasurement/Default (= 12.0.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 (11.14.0):
21-
- FirebaseCoreInternal (~> 11.14.0)
20+
- FirebaseCore (12.0.0):
21+
- FirebaseCoreInternal (~> 12.0.0)
2222
- GoogleUtilities/Environment (~> 8.1)
2323
- GoogleUtilities/Logger (~> 8.1)
24-
- FirebaseCoreInternal (11.14.0):
24+
- FirebaseCoreInternal (12.0.0):
2525
- "GoogleUtilities/NSData+zlib (~> 8.1)"
26-
- FirebaseInstallations (11.14.0):
27-
- FirebaseCore (~> 11.14.0)
26+
- FirebaseInstallations (12.0.0):
27+
- FirebaseCore (~> 12.0.0)
2828
- GoogleUtilities/Environment (~> 8.1)
2929
- GoogleUtilities/UserDefaults (~> 8.1)
3030
- PromisesObjC (~> 2.4)
31-
- GoogleAdsOnDeviceConversion (2.0.0):
31+
- GoogleAdsOnDeviceConversion (2.1.0):
3232
- GoogleUtilities/Logger (~> 8.1)
3333
- GoogleUtilities/Network (~> 8.1)
3434
- nanopb (~> 3.30910.0)
35-
- GoogleAppMeasurement/Core (11.14.0):
35+
- GoogleAppMeasurement/Core (12.0.0):
3636
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
3737
- GoogleUtilities/MethodSwizzler (~> 8.1)
3838
- GoogleUtilities/Network (~> 8.1)
3939
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4040
- nanopb (~> 3.30910.0)
41-
- GoogleAppMeasurement/Default (11.14.0):
42-
- GoogleAdsOnDeviceConversion (= 2.0.0)
43-
- GoogleAppMeasurement/Core (= 11.14.0)
44-
- GoogleAppMeasurement/IdentitySupport (= 11.14.0)
41+
- GoogleAppMeasurement/Default (12.0.0):
42+
- GoogleAdsOnDeviceConversion (= 2.1.0)
43+
- GoogleAppMeasurement/Core (= 12.0.0)
44+
- GoogleAppMeasurement/IdentitySupport (= 12.0.0)
4545
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4646
- GoogleUtilities/MethodSwizzler (~> 8.1)
4747
- GoogleUtilities/Network (~> 8.1)
4848
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4949
- nanopb (~> 3.30910.0)
50-
- GoogleAppMeasurement/IdentitySupport (11.14.0):
51-
- GoogleAppMeasurement/Core (= 11.14.0)
50+
- GoogleAppMeasurement/IdentitySupport (12.0.0):
51+
- GoogleAppMeasurement/Core (= 12.0.0)
5252
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5353
- GoogleUtilities/MethodSwizzler (~> 8.1)
5454
- GoogleUtilities/Network (~> 8.1)
@@ -104,16 +104,16 @@ SPEC REPOS:
104104
- PromisesObjC
105105

106106
SPEC CHECKSUMS:
107-
FirebaseAnalytics: d604dc875290f0213b9ead8a4692cf1e91e024d9
108-
FirebaseCore: 8fb12caed934c900218ce66a419107db74214ade
109-
FirebaseCoreInternal: 6a3b668197644aa858fc4127578637c6767ba123
110-
FirebaseInstallations: 863f2846bb124331b501d29c0f17f95caa2ef6bb
111-
GoogleAdsOnDeviceConversion: 5c3c8de58786e7d0a4bdecbd32c16f87d815cc9f
112-
GoogleAppMeasurement: 078fe9bfeed8e398253772ce81ef8690b0413b45
107+
FirebaseAnalytics: 6d790cd1b159b4eb61a99948df0934ce505a34f7
108+
FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a
109+
FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55
110+
FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
111+
GoogleAdsOnDeviceConversion: 2be6297a4f048459e0ae17fad9bfd2844e10cf64
112+
GoogleAppMeasurement: 8f6ab04ad6ae493b53fcf56bd26323fb2f1384f3
113113
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
114114
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
115115
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
116116

117-
PODFILE CHECKSUM: 05d2ebc8d2857bd09f061ac45e38899987da99af
117+
PODFILE CHECKSUM: 6097b0ced448df423a1a885a6de5c1c6b63e4559
118118

119119
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)