Skip to content

Commit 769deb8

Browse files
author
Emilio Pavia
committed
Update Podfile.lock
1 parent e9b4b79 commit 769deb8

File tree

8 files changed

+125
-115
lines changed

8 files changed

+125
-115
lines changed

.swiftlint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ disabled_rules:
3434
- cyclomatic_complexity # We'll catch future issues in code review.
3535
- nesting # We have some cases where deeper nesting is desirable.
3636
- trailing_whitespace # So annoying...
37+
- computed_accessors_order
38+
- unneeded_notification_center_removal
39+
- mark

Podfile

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -71,53 +71,8 @@ post_install do |installer|
7171
puts "Setting deployment target #{deployment_target} for #{config.name} on #{target.name}..."
7272
end
7373
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
74-
upgrade_to_recommended_settings! config
7574
end
7675
end
7776
puts "Generating Science Journal protos..."
7877
system("cd Protos && ./generate.sh")
79-
puts "Removing unfixable warnings..."
80-
remove_unfixable_warnings! installer
81-
puts "Fixing UIWebView usage..."
82-
replace_uiwebview_with_wkwebview! installer
83-
end
84-
85-
def upgrade_to_recommended_settings! config
86-
if Pod::VERSION == '1.7.3'
87-
# Having this set triggers Xcode's "Upgrade to recommended settings"
88-
config.build_settings.delete('ARCHS')
89-
end
90-
end
91-
92-
def remove_unfixable_warnings! installer
93-
installer.pod_targets.each do |target|
94-
if target.name == 'MaterialComponents' && target.version == '85.0.0'
95-
# The *ColorThemer types currently emit deprecation warnings,
96-
# but the new versions aren't available yet.
97-
installer.pods_project.files.map(&:path).grep(/MDC\w+ColorThemer.h/).each do |file|
98-
path = "Pods/MaterialComponents/#{file}"
99-
content = IO.read(path).gsub(/__deprecated_msg\([^)]*\)/, '')
100-
File.chmod(0644, path)
101-
IO.write(path, content)
102-
File.chmod(0444, path)
103-
end
104-
end
105-
end
106-
end
107-
108-
def replace_uiwebview_with_wkwebview! installer
109-
installer.pod_targets.each do |target|
110-
if target.name == 'MaterialComponents' && target.version == '85.0.0'
111-
installer.pods_project.files.map(&:path).grep(/MDCBottomSheetPresentationController.m/).each do |file|
112-
path = "Pods/MaterialComponents/#{file}"
113-
content = IO.read(path)
114-
.gsub(/UIWebView/, 'WKWebView')
115-
.gsub(/#import "MDCBottomSheetPresentationController.h"/,
116-
"#import \"MDCBottomSheetPresentationController.h\"\n\n#import <WebKit/WebKit.h>\n")
117-
File.chmod(0644, path)
118-
IO.write(path, content)
119-
File.chmod(0444, path)
120-
end
121-
end
122-
end
12378
end

Podfile.lock

Lines changed: 112 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,27 @@ PODS:
44
- GoogleAPIClientForREST/Drive (1.2.1):
55
- GoogleAPIClientForREST/Core
66
- GTMSessionFetcher (>= 1.1.7)
7-
- GTMSessionFetcher (1.2.2):
8-
- GTMSessionFetcher/Full (= 1.2.2)
9-
- GTMSessionFetcher/Core (1.2.2)
10-
- GTMSessionFetcher/Full (1.2.2):
11-
- GTMSessionFetcher/Core (= 1.2.2)
12-
- MaterialComponents/ActionSheet (85.0.0):
7+
- GTMSessionFetcher (1.4.0):
8+
- GTMSessionFetcher/Full (= 1.4.0)
9+
- GTMSessionFetcher/Core (1.4.0)
10+
- GTMSessionFetcher/Full (1.4.0):
11+
- GTMSessionFetcher/Core (= 1.4.0)
12+
- MaterialComponents/ActionSheet (118.0.0):
13+
- MaterialComponents/Availability
1314
- MaterialComponents/BottomSheet
15+
- MaterialComponents/Elevation
1416
- MaterialComponents/Ink
17+
- MaterialComponents/private/Math
1518
- MaterialComponents/Ripple
19+
- MaterialComponents/ShadowElevations
1620
- MaterialComponents/Typography
17-
- MaterialComponents/ActivityIndicator (85.0.0):
21+
- MaterialComponents/ActivityIndicator (118.0.0):
1822
- MaterialComponents/Palettes
1923
- MaterialComponents/private/Application
2024
- MDFInternationalization
2125
- MotionAnimator (~> 2.0)
22-
- MaterialComponents/AnimationTiming (85.0.0)
23-
- MaterialComponents/AppBar (85.0.0):
26+
- MaterialComponents/AnimationTiming (118.0.0)
27+
- MaterialComponents/AppBar (118.0.0):
2428
- MaterialComponents/FlexibleHeader
2529
- MaterialComponents/HeaderStackView
2630
- MaterialComponents/NavigationBar
@@ -31,29 +35,35 @@ PODS:
3135
- MaterialComponents/ShadowLayer
3236
- MaterialComponents/Typography
3337
- MDFInternationalization
34-
- MaterialComponents/BottomSheet (85.0.0):
38+
- MaterialComponents/Availability (118.0.0)
39+
- MaterialComponents/BottomSheet (118.0.0):
40+
- MaterialComponents/Elevation
3541
- MaterialComponents/private/KeyboardWatcher
3642
- MaterialComponents/private/Math
43+
- MaterialComponents/ShadowElevations
44+
- MaterialComponents/ShadowLayer
3745
- MaterialComponents/ShapeLibrary
3846
- MaterialComponents/Shapes
39-
- MaterialComponents/ButtonBar (85.0.0):
47+
- MaterialComponents/ButtonBar (118.0.0):
4048
- MaterialComponents/Buttons
4149
- MaterialComponents/private/Application
4250
- MDFInternationalization
43-
- MaterialComponents/Buttons (85.0.0):
51+
- MaterialComponents/Buttons (118.0.0):
52+
- MaterialComponents/Elevation
4453
- MaterialComponents/Ink
4554
- MaterialComponents/private/Math
4655
- MaterialComponents/Ripple
4756
- MaterialComponents/ShadowElevations
4857
- MaterialComponents/ShadowLayer
58+
- MaterialComponents/ShapeLibrary
4959
- MaterialComponents/Shapes
5060
- MaterialComponents/Typography
5161
- MDFInternationalization
5262
- MDFTextAccessibility
53-
- "MaterialComponents/Buttons+ColorThemer (85.0.0)":
63+
- "MaterialComponents/Buttons+ColorThemer (118.0.0)":
5464
- MaterialComponents/Buttons
5565
- MaterialComponents/schemes/Color
56-
- MaterialComponents/CollectionCells (85.0.0):
66+
- MaterialComponents/CollectionCells (118.0.0):
5767
- MaterialComponents/CollectionLayoutAttributes
5868
- MaterialComponents/Ink
5969
- MaterialComponents/Palettes
@@ -64,105 +74,145 @@ PODS:
6474
- MaterialComponents/private/Icons/ic_radio_button_unchecked
6575
- MaterialComponents/private/Icons/ic_reorder
6676
- MaterialComponents/private/Math
77+
- MaterialComponents/Ripple
6778
- MaterialComponents/Typography
6879
- MDFInternationalization
69-
- MaterialComponents/CollectionLayoutAttributes (85.0.0)
70-
- MaterialComponents/Collections (85.0.0):
80+
- MaterialComponents/CollectionLayoutAttributes (118.0.0)
81+
- MaterialComponents/Collections (118.0.0):
82+
- MaterialComponents/Availability
7183
- MaterialComponents/CollectionCells
7284
- MaterialComponents/CollectionLayoutAttributes
7385
- MaterialComponents/Ink
7486
- MaterialComponents/Palettes
87+
- MaterialComponents/Ripple
7588
- MaterialComponents/ShadowElevations
7689
- MaterialComponents/ShadowLayer
7790
- MaterialComponents/Typography
78-
- MaterialComponents/Dialogs (85.0.0):
91+
- MaterialComponents/Dialogs (118.0.0):
7992
- MaterialComponents/Buttons
93+
- MaterialComponents/Elevation
8094
- MaterialComponents/private/KeyboardWatcher
95+
- MaterialComponents/private/Math
8196
- MaterialComponents/ShadowElevations
8297
- MaterialComponents/ShadowLayer
8398
- MaterialComponents/Typography
8499
- MDFInternationalization
85-
- "MaterialComponents/Dialogs+ColorThemer (85.0.0)":
100+
- "MaterialComponents/Dialogs+ColorThemer (118.0.0)":
86101
- "MaterialComponents/Buttons+ColorThemer"
87102
- MaterialComponents/Dialogs
88103
- MaterialComponents/Themes
89-
- MaterialComponents/FeatureHighlight (85.0.0):
104+
- MaterialComponents/Elevation (118.0.0):
105+
- MaterialComponents/Availability
106+
- MaterialComponents/private/Color
107+
- MaterialComponents/private/Math
108+
- MaterialComponents/FeatureHighlight (118.0.0):
109+
- MaterialComponents/Availability
90110
- MaterialComponents/private/Math
91111
- MaterialComponents/Typography
92112
- MDFTextAccessibility
93-
- "MaterialComponents/FeatureHighlight+ColorThemer (85.0.0)":
113+
- "MaterialComponents/FeatureHighlight+ColorThemer (118.0.0)":
94114
- MaterialComponents/FeatureHighlight
95115
- MaterialComponents/Themes
96-
- MaterialComponents/FlexibleHeader (85.0.0):
116+
- MaterialComponents/FlexibleHeader (118.0.0):
117+
- MaterialComponents/Availability
118+
- MaterialComponents/Elevation
119+
- "MaterialComponents/FlexibleHeader+ShiftBehavior"
120+
- "MaterialComponents/FlexibleHeader+ShiftBehaviorEnabledWithStatusBar"
97121
- MaterialComponents/private/Application
122+
- MaterialComponents/private/Math
98123
- MaterialComponents/private/UIMetrics
124+
- MaterialComponents/ShadowElevations
125+
- MaterialComponents/ShadowLayer
99126
- MDFTextAccessibility
100-
- MaterialComponents/HeaderStackView (85.0.0)
101-
- MaterialComponents/Ink (85.0.0):
127+
- "MaterialComponents/FlexibleHeader+ShiftBehavior (118.0.0)"
128+
- "MaterialComponents/FlexibleHeader+ShiftBehaviorEnabledWithStatusBar (118.0.0)":
129+
- "MaterialComponents/FlexibleHeader+ShiftBehavior"
130+
- MaterialComponents/HeaderStackView (118.0.0)
131+
- MaterialComponents/Ink (118.0.0):
132+
- MaterialComponents/Availability
133+
- MaterialComponents/private/Color
102134
- MaterialComponents/private/Math
103-
- MaterialComponents/NavigationBar (85.0.0):
135+
- MaterialComponents/NavigationBar (118.0.0):
104136
- MaterialComponents/ButtonBar
137+
- MaterialComponents/Elevation
105138
- MaterialComponents/private/Math
106139
- MaterialComponents/Typography
107140
- MDFInternationalization
108141
- MDFTextAccessibility
109-
- MaterialComponents/OverlayWindow (85.0.0):
142+
- MaterialComponents/OverlayWindow (118.0.0):
143+
- MaterialComponents/Availability
110144
- MaterialComponents/private/Application
111-
- MaterialComponents/PageControl (85.0.0):
145+
- MaterialComponents/PageControl (118.0.0):
112146
- MDFInternationalization
113-
- MaterialComponents/Palettes (85.0.0)
114-
- MaterialComponents/private/Application (85.0.0)
115-
- MaterialComponents/private/Icons/Base (85.0.0)
116-
- MaterialComponents/private/Icons/ic_arrow_back (85.0.0):
147+
- MaterialComponents/Palettes (118.0.0)
148+
- MaterialComponents/private/Application (118.0.0)
149+
- MaterialComponents/private/Color (118.0.0):
150+
- MaterialComponents/Availability
151+
- MaterialComponents/private/Icons/Base (118.0.0)
152+
- MaterialComponents/private/Icons/ic_arrow_back (118.0.0):
117153
- MaterialComponents/private/Icons/Base
118-
- MaterialComponents/private/Icons/ic_check (85.0.0):
154+
- MaterialComponents/private/Icons/ic_check (118.0.0):
119155
- MaterialComponents/private/Icons/Base
120-
- MaterialComponents/private/Icons/ic_check_circle (85.0.0):
156+
- MaterialComponents/private/Icons/ic_check_circle (118.0.0):
121157
- MaterialComponents/private/Icons/Base
122-
- MaterialComponents/private/Icons/ic_chevron_right (85.0.0):
158+
- MaterialComponents/private/Icons/ic_chevron_right (118.0.0):
123159
- MaterialComponents/private/Icons/Base
124-
- MaterialComponents/private/Icons/ic_info (85.0.0):
160+
- MaterialComponents/private/Icons/ic_info (118.0.0):
125161
- MaterialComponents/private/Icons/Base
126-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (85.0.0):
162+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (118.0.0):
127163
- MaterialComponents/private/Icons/Base
128-
- MaterialComponents/private/Icons/ic_reorder (85.0.0):
164+
- MaterialComponents/private/Icons/ic_reorder (118.0.0):
129165
- MaterialComponents/private/Icons/Base
130-
- MaterialComponents/private/KeyboardWatcher (85.0.0):
166+
- MaterialComponents/private/KeyboardWatcher (118.0.0):
131167
- MaterialComponents/private/Application
132-
- MaterialComponents/private/Math (85.0.0)
133-
- MaterialComponents/private/Overlay (85.0.0)
134-
- MaterialComponents/private/UIMetrics (85.0.0):
168+
- MaterialComponents/private/Math (118.0.0)
169+
- MaterialComponents/private/Overlay (118.0.0)
170+
- MaterialComponents/private/UIMetrics (118.0.0):
135171
- MaterialComponents/private/Application
136-
- MaterialComponents/ProgressView (85.0.0):
172+
- MaterialComponents/ProgressView (118.0.0):
137173
- MaterialComponents/Palettes
138174
- MaterialComponents/private/Math
139175
- MDFInternationalization
140-
- MotionAnimator (~> 2.1)
141-
- MaterialComponents/Ripple (85.0.0):
176+
- MaterialComponents/Ripple (118.0.0):
142177
- MaterialComponents/AnimationTiming
178+
- MaterialComponents/Availability
179+
- MaterialComponents/private/Color
143180
- MaterialComponents/private/Math
144-
- MaterialComponents/schemes/Color (85.0.0)
145-
- MaterialComponents/schemes/Typography (85.0.0):
181+
- MaterialComponents/schemes/Color (118.0.0):
182+
- MaterialComponents/Availability
183+
- MaterialComponents/private/Color
184+
- MaterialComponents/schemes/Typography (118.0.0):
185+
- "MaterialComponents/schemes/Typography+BasicFontScheme"
186+
- "MaterialComponents/schemes/Typography+Scheming"
146187
- MaterialComponents/Typography
147-
- MaterialComponents/ShadowElevations (85.0.0)
148-
- MaterialComponents/ShadowLayer (85.0.0):
188+
- "MaterialComponents/schemes/Typography+BasicFontScheme (118.0.0)"
189+
- "MaterialComponents/schemes/Typography+Scheming (118.0.0)"
190+
- MaterialComponents/ShadowElevations (118.0.0)
191+
- MaterialComponents/ShadowLayer (118.0.0):
149192
- MaterialComponents/ShadowElevations
150-
- MaterialComponents/ShapeLibrary (85.0.0):
193+
- MaterialComponents/ShapeLibrary (118.0.0):
151194
- MaterialComponents/private/Math
152195
- MaterialComponents/Shapes
153-
- MaterialComponents/Shapes (85.0.0):
196+
- MaterialComponents/Shapes (118.0.0):
197+
- MaterialComponents/private/Color
154198
- MaterialComponents/private/Math
155199
- MaterialComponents/ShadowLayer
156-
- MaterialComponents/Snackbar (85.0.0):
200+
- MaterialComponents/Snackbar (118.0.0):
157201
- MaterialComponents/AnimationTiming
202+
- MaterialComponents/Availability
158203
- MaterialComponents/Buttons
204+
- MaterialComponents/Elevation
159205
- MaterialComponents/OverlayWindow
160206
- MaterialComponents/private/Application
161207
- MaterialComponents/private/KeyboardWatcher
208+
- MaterialComponents/private/Math
162209
- MaterialComponents/private/Overlay
210+
- MaterialComponents/ShadowElevations
211+
- MaterialComponents/ShadowLayer
163212
- MaterialComponents/Typography
164-
- MaterialComponents/Tabs (85.0.0):
213+
- MaterialComponents/Tabs (118.0.0):
165214
- MaterialComponents/AnimationTiming
215+
- MaterialComponents/Elevation
166216
- MaterialComponents/Ink
167217
- MaterialComponents/Palettes
168218
- MaterialComponents/private/Math
@@ -171,18 +221,21 @@ PODS:
171221
- MaterialComponents/ShadowLayer
172222
- MaterialComponents/Typography
173223
- MDFInternationalization
174-
- MaterialComponents/TextFields (85.0.0):
224+
- MaterialComponents/TextFields (118.0.0):
175225
- MaterialComponents/AnimationTiming
226+
- MaterialComponents/Buttons
227+
- MaterialComponents/Elevation
176228
- MaterialComponents/Palettes
177229
- MaterialComponents/private/Math
178230
- MaterialComponents/Typography
179231
- MDFInternationalization
180-
- MaterialComponents/Themes (85.0.0):
232+
- MaterialComponents/Themes (118.0.0):
181233
- MaterialComponents/schemes/Color
182234
- MaterialComponents/schemes/Typography
183-
- MaterialComponents/Typography (85.0.0):
235+
- MaterialComponents/Typography (118.0.0):
184236
- MaterialComponents/private/Application
185237
- MaterialComponents/private/Math
238+
- MDFTextAccessibility
186239
- MDFInternationalization (2.0.0)
187240
- MDFTextAccessibility (2.0.0)
188241
- MotionAnimator (2.8.1):
@@ -191,7 +244,7 @@ PODS:
191244
- Protobuf (3.5.0)
192245
- SnapKit (5.0.0)
193246
- SSZipArchive (2.1.1)
194-
- SwiftLint (0.33.0)
247+
- SwiftLint (0.40.3)
195248

196249
DEPENDENCIES:
197250
- GoogleAPIClientForREST/Drive (~> 1.2.1)
@@ -247,17 +300,17 @@ SPEC REPOS:
247300

248301
SPEC CHECKSUMS:
249302
GoogleAPIClientForREST: a8b95a252014ce2e618df6b75dc72eca2c00b4af
250-
GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
251-
MaterialComponents: 9e545cf19802e6acf017fe774c90e36176ea7066
303+
GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
304+
MaterialComponents: 333a09d55de4bc53e0e2e08f178c6f29cfe8645f
252305
MDFInternationalization: 010097556d6b09d2c4ea38e0820ea6d37be6a314
253306
MDFTextAccessibility: 85c09a1bd9c321f494348e632a25063bcda35a53
254307
MotionAnimator: ee16aa30567c5bae0fb2750c132915829cfaaf8a
255308
MotionInterchange: ead0e3ae1f3a5fb539e289debbc7ae036160a10d
256309
Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03
257310
SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf
258311
SSZipArchive: 14401ade5f8e82aba1ff03e9f88e9de60937ae60
259-
SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
312+
SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7
260313

261-
PODFILE CHECKSUM: 1ac19eccb38684fe8747c94a3b160062e8af4be6
314+
PODFILE CHECKSUM: 7fc20c5c17bd14830e5b0930dfd5f5b75cdf86d3
262315

263316
COCOAPODS: 1.9.3

0 commit comments

Comments
 (0)