git.iko.soy/gogol
on develop help sign in
Merge pull request #119 from brendanhay/feature/conduit-upgrade-2

Feature/conduit upgrade 2

commit7879a6dc5c18edfa57e0230f0aeeb105b76f1903 authorMichael Xavier <michael@michaelxavier.net> dateMon 7 Jan 2019, 10:21 (8 years ago) parentc2eba2dd9d8562
22 files changed+520−437
compare with develop
unifiedsplit
.travis.yml+220−220 core/gogol-core.cabal+1−1 core/src/Network/Google/Types.hs+42−37 examples/src/Example/Storage.hs+3−3 gen/.stylish-haskell.yaml+7−3 gen/annex/dns.json+49−2 gen/gogol-gen.cabal+1−1 gen/model/dns/v2beta1/dns-api.json+8−8 gen/src/Gen/Formatting.hs+1−1 gen/src/Gen/IO.hs+10−4 gen/src/Gen/Types/Help.hs+26−24 gen/stack.yaml−5 gogol-dns/gen/Network/Google/DNS.hs+5−5 gogol-dns/gen/Network/Google/DNS/Types.hs+5−5 gogol-dns/gen/Network/Google/DNS/Types/Product.hs+49−49 gogol/gogol.cabal+3−4 gogol/src/Network/Google.hs+32−32 gogol/src/Network/Google/Internal/HTTP.hs+26−22 stack-7.10.3.yaml+11−3 stack-8.0.2.yaml+10−4 stack-8.2.yaml → stack-8.2.2.yaml+10−3 stack.yaml+1−1
.travis.yml+220−220
@@ -33,264 +33,264 @@ matrix:
3333# GENERATED
3434
3535 # Documentation
36− - env: GHCVER=8.2 LIBRARY=documentation
37− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
36+ - env: GHCVER=8.2.2 LIBRARY=documentation
37+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
3838
3939 # Core
40− - env: GHCVER=8.2 LIBRARY=gogol-core
41− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
40+ - env: GHCVER=8.2.2 LIBRARY=gogol-core
41+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
4242 - env: GHCVER=8.0.2 LIBRARY=gogol-core
4343 addons: { apt: { packages: [ghc-8.0.2], sources: [hvr-ghc] } }
4444 - env: GHCVER=7.10.3 LIBRARY=gogol-core
4545 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }
46− - env: GHCVER=8.2 LIBRARY=gogol
47− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
46+ - env: GHCVER=8.2.2 LIBRARY=gogol
47+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
4848 - env: GHCVER=8.0.2 LIBRARY=gogol
4949 addons: { apt: { packages: [ghc-8.0.2], sources: [hvr-ghc] } }
5050 - env: GHCVER=7.10.3 LIBRARY=gogol
5151 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }
5252
5353 # Priority
54− - env: GHCVER=8.2 LIBRARY=gogol-compute
55− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
54+ - env: GHCVER=8.2.2 LIBRARY=gogol-compute
55+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
5656 - env: GHCVER=8.0.2 LIBRARY=gogol-compute
5757 addons: { apt: { packages: [ghc-8.0.2], sources: [hvr-ghc] } }
5858 - env: GHCVER=7.10.3 LIBRARY=gogol-compute
5959 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }
60− - env: GHCVER=8.2 LIBRARY=gogol-drive
61− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
60+ - env: GHCVER=8.2.2 LIBRARY=gogol-drive
61+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
6262 - env: GHCVER=8.0.2 LIBRARY=gogol-drive
6363 addons: { apt: { packages: [ghc-8.0.2], sources: [hvr-ghc] } }
6464 - env: GHCVER=7.10.3 LIBRARY=gogol-drive
6565 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }
66− - env: GHCVER=8.2 LIBRARY=gogol-appengine
67− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
66+ - env: GHCVER=8.2.2 LIBRARY=gogol-appengine
67+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
6868 - env: GHCVER=8.0.2 LIBRARY=gogol-appengine
6969 addons: { apt: { packages: [ghc-8.0.2], sources: [hvr-ghc] } }
7070 - env: GHCVER=7.10.3 LIBRARY=gogol-appengine
7171 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }
72− - env: GHCVER=8.2 LIBRARY=gogol-storage
73− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
72+ - env: GHCVER=8.2.2 LIBRARY=gogol-storage
73+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
7474 - env: GHCVER=8.0.2 LIBRARY=gogol-storage
7575 addons: { apt: { packages: [ghc-8.0.2], sources: [hvr-ghc] } }
7676 - env: GHCVER=7.10.3 LIBRARY=gogol-storage
7777 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }
78− - env: GHCVER=8.2 LIBRARY=gogol-oauth2
79− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
78+ - env: GHCVER=8.2.2 LIBRARY=gogol-oauth2
79+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
8080 - env: GHCVER=8.0.2 LIBRARY=gogol-oauth2
8181 addons: { apt: { packages: [ghc-8.0.2], sources: [hvr-ghc] } }
8282 - env: GHCVER=7.10.3 LIBRARY=gogol-oauth2
8383 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }
84− - env: GHCVER=8.2 LIBRARY=gogol-gmail
85− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
84+ - env: GHCVER=8.2.2 LIBRARY=gogol-gmail
85+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
8686 - env: GHCVER=8.0.2 LIBRARY=gogol-gmail
8787 addons: { apt: { packages: [ghc-8.0.2], sources: [hvr-ghc] } }
8888 - env: GHCVER=7.10.3 LIBRARY=gogol-gmail
8989 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }
9090
9191 # Remainder
92− - env: GHCVER=8.2 LIBRARY=gogol-adexchange-buyer
93− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
94− - env: GHCVER=8.2 LIBRARY=gogol-adexchange-seller
95− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
96− - env: GHCVER=8.2 LIBRARY=gogol-admin-datatransfer
97− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
98− - env: GHCVER=8.2 LIBRARY=gogol-admin-directory
99− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
100− - env: GHCVER=8.2 LIBRARY=gogol-admin-emailmigration
101− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
102− - env: GHCVER=8.2 LIBRARY=gogol-admin-reports
103− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
104− - env: GHCVER=8.2 LIBRARY=gogol-adsense
105− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
106− - env: GHCVER=8.2 LIBRARY=gogol-adsense-host
107− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
108− - env: GHCVER=8.2 LIBRARY=gogol-affiliates
109− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
110− - env: GHCVER=8.2 LIBRARY=gogol-analytics
111− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
112− - env: GHCVER=8.2 LIBRARY=gogol-android-enterprise
113− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
114− - env: GHCVER=8.2 LIBRARY=gogol-android-publisher
115− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
116− - env: GHCVER=8.2 LIBRARY=gogol-apps-activity
117− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
118− - env: GHCVER=8.2 LIBRARY=gogol-apps-calendar
119− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
120− - env: GHCVER=8.2 LIBRARY=gogol-apps-licensing
121− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
122− - env: GHCVER=8.2 LIBRARY=gogol-apps-reseller
123− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
124− - env: GHCVER=8.2 LIBRARY=gogol-apps-tasks
125− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
126− - env: GHCVER=8.2 LIBRARY=gogol-appstate
127− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
128− - env: GHCVER=8.2 LIBRARY=gogol-autoscaler
129− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
130− - env: GHCVER=8.2 LIBRARY=gogol-bigquery
131− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
132− - env: GHCVER=8.2 LIBRARY=gogol-billing
133− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
134− - env: GHCVER=8.2 LIBRARY=gogol-blogger
135− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
136− - env: GHCVER=8.2 LIBRARY=gogol-books
137− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
138− - env: GHCVER=8.2 LIBRARY=gogol-civicinfo
139− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
140− - env: GHCVER=8.2 LIBRARY=gogol-classroom
141− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
142− - env: GHCVER=8.2 LIBRARY=gogol-cloudmonitoring
143− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
144− - env: GHCVER=8.2 LIBRARY=gogol-cloudtrace
145− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
146− - env: GHCVER=8.2 LIBRARY=gogol-container
147− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
148− - env: GHCVER=8.2 LIBRARY=gogol-containerbuilder
149− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
150− - env: GHCVER=8.2 LIBRARY=gogol-customsearch
151− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
152− - env: GHCVER=8.2 LIBRARY=gogol-dataflow
153− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
154− - env: GHCVER=8.2 LIBRARY=gogol-dataproc
155− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
156− - env: GHCVER=8.2 LIBRARY=gogol-datastore
157− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
158− - env: GHCVER=8.2 LIBRARY=gogol-debugger
159− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
160− - env: GHCVER=8.2 LIBRARY=gogol-deploymentmanager
161− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
162− - env: GHCVER=8.2 LIBRARY=gogol-dfareporting
163− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
164− - env: GHCVER=8.2 LIBRARY=gogol-discovery
165− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
166− - env: GHCVER=8.2 LIBRARY=gogol-dns
167− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
168− - env: GHCVER=8.2 LIBRARY=gogol-doubleclick-bids
169− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
170− - env: GHCVER=8.2 LIBRARY=gogol-doubleclick-search
171− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
172− - env: GHCVER=8.2 LIBRARY=gogol-firebase-dynamiclinks
173− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
174− - env: GHCVER=8.2 LIBRARY=gogol-firebase-rules
175− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
176− - env: GHCVER=8.2 LIBRARY=gogol-fitness
177− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
178− - env: GHCVER=8.2 LIBRARY=gogol-fonts
179− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
180− - env: GHCVER=8.2 LIBRARY=gogol-freebasesearch
181− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
182− - env: GHCVER=8.2 LIBRARY=gogol-fusiontables
183− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
184− - env: GHCVER=8.2 LIBRARY=gogol-games
185− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
186− - env: GHCVER=8.2 LIBRARY=gogol-games-configuration
187− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
188− - env: GHCVER=8.2 LIBRARY=gogol-games-management
189− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
190− - env: GHCVER=8.2 LIBRARY=gogol-genomics
191− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
192− - env: GHCVER=8.2 LIBRARY=gogol-groups-migration
193− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
194− - env: GHCVER=8.2 LIBRARY=gogol-groups-settings
195− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
196− - env: GHCVER=8.2 LIBRARY=gogol-iam
197− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
198− - env: GHCVER=8.2 LIBRARY=gogol-identity-toolkit
199− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
200− - env: GHCVER=8.2 LIBRARY=gogol-kgsearch
201− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
202− - env: GHCVER=8.2 LIBRARY=gogol-language
203− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
204− - env: GHCVER=8.2 LIBRARY=gogol-latencytest
205− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
206− - env: GHCVER=8.2 LIBRARY=gogol-logging
207− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
208− - env: GHCVER=8.2 LIBRARY=gogol-manufacturers
209− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
210− - env: GHCVER=8.2 LIBRARY=gogol-maps-coordinate
211− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
212− - env: GHCVER=8.2 LIBRARY=gogol-maps-engine
213− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
214− - env: GHCVER=8.2 LIBRARY=gogol-mirror
215− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
216− - env: GHCVER=8.2 LIBRARY=gogol-ml
217− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
218− - env: GHCVER=8.2 LIBRARY=gogol-monitoring
219− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
220− - env: GHCVER=8.2 LIBRARY=gogol-pagespeed
221− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
222− - env: GHCVER=8.2 LIBRARY=gogol-partners
223− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
224− - env: GHCVER=8.2 LIBRARY=gogol-people
225− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
226− - env: GHCVER=8.2 LIBRARY=gogol-play-moviespartner
227− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
228− - env: GHCVER=8.2 LIBRARY=gogol-plus
229− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
230− - env: GHCVER=8.2 LIBRARY=gogol-plus-domains
231− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
232− - env: GHCVER=8.2 LIBRARY=gogol-prediction
233− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
234− - env: GHCVER=8.2 LIBRARY=gogol-proximitybeacon
235− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
236− - env: GHCVER=8.2 LIBRARY=gogol-pubsub
237− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
238− - env: GHCVER=8.2 LIBRARY=gogol-qpxexpress
239− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
240− - env: GHCVER=8.2 LIBRARY=gogol-replicapool
241− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
242− - env: GHCVER=8.2 LIBRARY=gogol-replicapool-updater
243− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
244− - env: GHCVER=8.2 LIBRARY=gogol-resourcemanager
245− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
246− - env: GHCVER=8.2 LIBRARY=gogol-resourceviews
247− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
248− - env: GHCVER=8.2 LIBRARY=gogol-runtimeconfig
249− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
250− - env: GHCVER=8.2 LIBRARY=gogol-safebrowsing
251− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
252− - env: GHCVER=8.2 LIBRARY=gogol-script
253− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
254− - env: GHCVER=8.2 LIBRARY=gogol-servicecontrol
255− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
256− - env: GHCVER=8.2 LIBRARY=gogol-servicemanagement
257− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
258− - env: GHCVER=8.2 LIBRARY=gogol-sheets
259− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
260− - env: GHCVER=8.2 LIBRARY=gogol-shopping-content
261− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
262− - env: GHCVER=8.2 LIBRARY=gogol-siteverification
263− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
264− - env: GHCVER=8.2 LIBRARY=gogol-slides
265− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
266− - env: GHCVER=8.2 LIBRARY=gogol-spectrum
267− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
268− - env: GHCVER=8.2 LIBRARY=gogol-sqladmin
269− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
270− - env: GHCVER=8.2 LIBRARY=gogol-storage-transfer
271− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
272− - env: GHCVER=8.2 LIBRARY=gogol-tagmanager
273− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
274− - env: GHCVER=8.2 LIBRARY=gogol-taskqueue
275− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
276− - env: GHCVER=8.2 LIBRARY=gogol-translate
277− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
278− - env: GHCVER=8.2 LIBRARY=gogol-urlshortener
279− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
280− - env: GHCVER=8.2 LIBRARY=gogol-useraccounts
281− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
282− - env: GHCVER=8.2 LIBRARY=gogol-vision
283− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
284− - env: GHCVER=8.2 LIBRARY=gogol-webmaster-tools
285− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
286− - env: GHCVER=8.2 LIBRARY=gogol-youtube
287− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
288− - env: GHCVER=8.2 LIBRARY=gogol-youtube-analytics
289− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
290− - env: GHCVER=8.2 LIBRARY=gogol-youtube-reporting
291− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
92+ - env: GHCVER=8.2.2 LIBRARY=gogol-adexchange-buyer
93+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
94+ - env: GHCVER=8.2.2 LIBRARY=gogol-adexchange-seller
95+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
96+ - env: GHCVER=8.2.2 LIBRARY=gogol-admin-datatransfer
97+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
98+ - env: GHCVER=8.2.2 LIBRARY=gogol-admin-directory
99+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
100+ - env: GHCVER=8.2.2 LIBRARY=gogol-admin-emailmigration
101+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
102+ - env: GHCVER=8.2.2 LIBRARY=gogol-admin-reports
103+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
104+ - env: GHCVER=8.2.2 LIBRARY=gogol-adsense
105+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
106+ - env: GHCVER=8.2.2 LIBRARY=gogol-adsense-host
107+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
108+ - env: GHCVER=8.2.2 LIBRARY=gogol-affiliates
109+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
110+ - env: GHCVER=8.2.2 LIBRARY=gogol-analytics
111+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
112+ - env: GHCVER=8.2.2 LIBRARY=gogol-android-enterprise
113+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
114+ - env: GHCVER=8.2.2 LIBRARY=gogol-android-publisher
115+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
116+ - env: GHCVER=8.2.2 LIBRARY=gogol-apps-activity
117+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
118+ - env: GHCVER=8.2.2 LIBRARY=gogol-apps-calendar
119+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
120+ - env: GHCVER=8.2.2 LIBRARY=gogol-apps-licensing
121+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
122+ - env: GHCVER=8.2.2 LIBRARY=gogol-apps-reseller
123+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
124+ - env: GHCVER=8.2.2 LIBRARY=gogol-apps-tasks
125+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
126+ - env: GHCVER=8.2.2 LIBRARY=gogol-appstate
127+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
128+ - env: GHCVER=8.2.2 LIBRARY=gogol-autoscaler
129+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
130+ - env: GHCVER=8.2.2 LIBRARY=gogol-bigquery
131+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
132+ - env: GHCVER=8.2.2 LIBRARY=gogol-billing
133+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
134+ - env: GHCVER=8.2.2 LIBRARY=gogol-blogger
135+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
136+ - env: GHCVER=8.2.2 LIBRARY=gogol-books
137+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
138+ - env: GHCVER=8.2.2 LIBRARY=gogol-civicinfo
139+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
140+ - env: GHCVER=8.2.2 LIBRARY=gogol-classroom
141+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
142+ - env: GHCVER=8.2.2 LIBRARY=gogol-cloudmonitoring
143+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
144+ - env: GHCVER=8.2.2 LIBRARY=gogol-cloudtrace
145+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
146+ - env: GHCVER=8.2.2 LIBRARY=gogol-container
147+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
148+ - env: GHCVER=8.2.2 LIBRARY=gogol-containerbuilder
149+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
150+ - env: GHCVER=8.2.2 LIBRARY=gogol-customsearch
151+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
152+ - env: GHCVER=8.2.2 LIBRARY=gogol-dataflow
153+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
154+ - env: GHCVER=8.2.2 LIBRARY=gogol-dataproc
155+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
156+ - env: GHCVER=8.2.2 LIBRARY=gogol-datastore
157+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
158+ - env: GHCVER=8.2.2 LIBRARY=gogol-debugger
159+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
160+ - env: GHCVER=8.2.2 LIBRARY=gogol-deploymentmanager
161+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
162+ - env: GHCVER=8.2.2 LIBRARY=gogol-dfareporting
163+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
164+ - env: GHCVER=8.2.2 LIBRARY=gogol-discovery
165+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
166+ - env: GHCVER=8.2.2 LIBRARY=gogol-dns
167+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
168+ - env: GHCVER=8.2.2 LIBRARY=gogol-doubleclick-bids
169+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
170+ - env: GHCVER=8.2.2 LIBRARY=gogol-doubleclick-search
171+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
172+ - env: GHCVER=8.2.2 LIBRARY=gogol-firebase-dynamiclinks
173+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
174+ - env: GHCVER=8.2.2 LIBRARY=gogol-firebase-rules
175+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
176+ - env: GHCVER=8.2.2 LIBRARY=gogol-fitness
177+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
178+ - env: GHCVER=8.2.2 LIBRARY=gogol-fonts
179+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
180+ - env: GHCVER=8.2.2 LIBRARY=gogol-freebasesearch
181+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
182+ - env: GHCVER=8.2.2 LIBRARY=gogol-fusiontables
183+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
184+ - env: GHCVER=8.2.2 LIBRARY=gogol-games
185+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
186+ - env: GHCVER=8.2.2 LIBRARY=gogol-games-configuration
187+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
188+ - env: GHCVER=8.2.2 LIBRARY=gogol-games-management
189+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
190+ - env: GHCVER=8.2.2 LIBRARY=gogol-genomics
191+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
192+ - env: GHCVER=8.2.2 LIBRARY=gogol-groups-migration
193+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
194+ - env: GHCVER=8.2.2 LIBRARY=gogol-groups-settings
195+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
196+ - env: GHCVER=8.2.2 LIBRARY=gogol-iam
197+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
198+ - env: GHCVER=8.2.2 LIBRARY=gogol-identity-toolkit
199+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
200+ - env: GHCVER=8.2.2 LIBRARY=gogol-kgsearch
201+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
202+ - env: GHCVER=8.2.2 LIBRARY=gogol-language
203+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
204+ - env: GHCVER=8.2.2 LIBRARY=gogol-latencytest
205+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
206+ - env: GHCVER=8.2.2 LIBRARY=gogol-logging
207+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
208+ - env: GHCVER=8.2.2 LIBRARY=gogol-manufacturers
209+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
210+ - env: GHCVER=8.2.2 LIBRARY=gogol-maps-coordinate
211+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
212+ - env: GHCVER=8.2.2 LIBRARY=gogol-maps-engine
213+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
214+ - env: GHCVER=8.2.2 LIBRARY=gogol-mirror
215+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
216+ - env: GHCVER=8.2.2 LIBRARY=gogol-ml
217+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
218+ - env: GHCVER=8.2.2 LIBRARY=gogol-monitoring
219+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
220+ - env: GHCVER=8.2.2 LIBRARY=gogol-pagespeed
221+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
222+ - env: GHCVER=8.2.2 LIBRARY=gogol-partners
223+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
224+ - env: GHCVER=8.2.2 LIBRARY=gogol-people
225+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
226+ - env: GHCVER=8.2.2 LIBRARY=gogol-play-moviespartner
227+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
228+ - env: GHCVER=8.2.2 LIBRARY=gogol-plus
229+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
230+ - env: GHCVER=8.2.2 LIBRARY=gogol-plus-domains
231+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
232+ - env: GHCVER=8.2.2 LIBRARY=gogol-prediction
233+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
234+ - env: GHCVER=8.2.2 LIBRARY=gogol-proximitybeacon
235+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
236+ - env: GHCVER=8.2.2 LIBRARY=gogol-pubsub
237+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
238+ - env: GHCVER=8.2.2 LIBRARY=gogol-qpxexpress
239+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
240+ - env: GHCVER=8.2.2 LIBRARY=gogol-replicapool
241+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
242+ - env: GHCVER=8.2.2 LIBRARY=gogol-replicapool-updater
243+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
244+ - env: GHCVER=8.2.2 LIBRARY=gogol-resourcemanager
245+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
246+ - env: GHCVER=8.2.2 LIBRARY=gogol-resourceviews
247+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
248+ - env: GHCVER=8.2.2 LIBRARY=gogol-runtimeconfig
249+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
250+ - env: GHCVER=8.2.2 LIBRARY=gogol-safebrowsing
251+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
252+ - env: GHCVER=8.2.2 LIBRARY=gogol-script
253+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
254+ - env: GHCVER=8.2.2 LIBRARY=gogol-servicecontrol
255+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
256+ - env: GHCVER=8.2.2 LIBRARY=gogol-servicemanagement
257+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
258+ - env: GHCVER=8.2.2 LIBRARY=gogol-sheets
259+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
260+ - env: GHCVER=8.2.2 LIBRARY=gogol-shopping-content
261+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
262+ - env: GHCVER=8.2.2 LIBRARY=gogol-siteverification
263+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
264+ - env: GHCVER=8.2.2 LIBRARY=gogol-slides
265+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
266+ - env: GHCVER=8.2.2 LIBRARY=gogol-spectrum
267+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
268+ - env: GHCVER=8.2.2 LIBRARY=gogol-sqladmin
269+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
270+ - env: GHCVER=8.2.2 LIBRARY=gogol-storage-transfer
271+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
272+ - env: GHCVER=8.2.2 LIBRARY=gogol-tagmanager
273+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
274+ - env: GHCVER=8.2.2 LIBRARY=gogol-taskqueue
275+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
276+ - env: GHCVER=8.2.2 LIBRARY=gogol-translate
277+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
278+ - env: GHCVER=8.2.2 LIBRARY=gogol-urlshortener
279+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
280+ - env: GHCVER=8.2.2 LIBRARY=gogol-useraccounts
281+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
282+ - env: GHCVER=8.2.2 LIBRARY=gogol-vision
283+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
284+ - env: GHCVER=8.2.2 LIBRARY=gogol-webmaster-tools
285+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
286+ - env: GHCVER=8.2.2 LIBRARY=gogol-youtube
287+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
288+ - env: GHCVER=8.2.2 LIBRARY=gogol-youtube-analytics
289+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
290+ - env: GHCVER=8.2.2 LIBRARY=gogol-youtube-reporting
291+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
292292
293293 # Examples
294− - env: GHCVER=8.2 LIBRARY=gogol-examples
295− addons: { apt: { packages: [ghc-8.2], sources: [hvr-ghc] } }
294+ - env: GHCVER=8.2.2 LIBRARY=gogol-examples
295+ addons: { apt: { packages: [ghc-8.2.2], sources: [hvr-ghc] } }
296296# END GENERATED
core/gogol-core.cabal+1−1
@@ -50,7 +50,7 @@ library
5050 , bifunctors >= 0.1
5151 , bytestring >= 0.9
5252 , case-insensitive >= 1.2
53− , conduit >= 1.1
53+ , conduit >= 1.3
5454 , dlist >= 0.7
5555 , exceptions >= 0.6
5656 , hashable >= 1.2
core/src/Network/Google/Types.hs+42−37
@@ -24,37 +24,41 @@
2424--
2525module Network.Google.Types where
2626
27−import Control.Applicative
28−import Control.Exception.Lens (exception)
29−import Control.Lens
30−import Control.Monad.Catch
31−import Control.Monad.Trans.Resource
32−import Data.Aeson
33−import Data.ByteString (ByteString)
34−import qualified Data.ByteString.Char8 as BS8
35−import qualified Data.ByteString.Lazy as LBS
36−import qualified Data.CaseInsensitive as CI
37−import Data.Coerce
38−import Data.Conduit
39−import qualified Data.Conduit.List as CL
40−import Data.Data
41−import Data.DList (DList)
42−import qualified Data.DList as DList
43−import Data.Foldable (foldMap, foldl')
44−import Data.Monoid
45−import Data.String
46−import Data.Text (Text)
47−import qualified Data.Text.Encoding as Text
48−import Data.Text.Lazy.Builder (Builder)
49−import qualified Data.Text.Lazy.Builder as Build
50−import GHC.Generics
51−import GHC.TypeLits
52−import Network.HTTP.Client (HttpException, RequestBody (..))
53−import Network.HTTP.Media hiding (Accept)
54−import Network.HTTP.Types hiding (Header)
55−import qualified Network.HTTP.Types as HTTP
56−import Servant.API hiding (Stream)
57−import Web.HttpApiData
27+import Control.Applicative
28+import Control.Exception.Lens (exception)
29+import Control.Lens
30+import Control.Monad.Catch
31+import Control.Monad.Trans.Resource
32+
33+import Data.Aeson
34+import Data.ByteString (ByteString)
35+import Data.Coerce
36+import Data.Conduit
37+import Data.Data
38+import Data.DList (DList)
39+import Data.Foldable (foldMap, foldl')
40+import Data.Semigroup
41+import Data.String
42+import Data.Text (Text)
43+import Data.Text.Lazy.Builder (Builder)
44+
45+import GHC.Generics
46+import GHC.TypeLits
47+
48+import Network.HTTP.Client (HttpException, RequestBody (..))
49+import Network.HTTP.Media hiding (Accept)
50+import Network.HTTP.Types hiding (Header)
51+
52+import Servant.API hiding (Stream)
53+
54+import qualified Data.ByteString.Char8 as BS8
55+import qualified Data.ByteString.Lazy as LBS
56+import qualified Data.CaseInsensitive as CI
57+import qualified Data.Conduit.Combinators as Conduit
58+import qualified Data.DList as DList
59+import qualified Data.Text.Encoding as Text
60+import qualified Data.Text.Lazy.Builder as Build
61+import qualified Network.HTTP.Types as HTTP
5862
5963data AltJSON = AltJSON deriving (Eq, Ord, Show, Read, Generic, Typeable)
6064data AltMedia = AltMedia deriving (Eq, Ord, Show, Read, Generic, Typeable)
@@ -163,7 +167,8 @@ instance Show Secret where
163167 show = const "*****"
164168
165169newtype MediaDownload a = MediaDownload a
166−data MediaUpload a = MediaUpload a Body
170+
171+data MediaUpload a = MediaUpload a Body
167172
168173_Coerce :: (Coercible a b, Coercible b a) => Iso' a b
169174_Coerce = iso coerce coerce
@@ -176,7 +181,7 @@ _Default = iso f Just
176181 f (Just x) = x
177182 f Nothing = mempty
178183
179−type Stream = ResumableSource (ResourceT IO) ByteString
184+type Stream = ConduitM () ByteString (ResourceT IO) ()
180185
181186data Error
182187 = TransportError HttpException
@@ -361,7 +366,7 @@ discard :: Method
361366 -> Request
362367 -> ServiceConfig
363368 -> Client ()
364−discard = client (\b -> closeResumableSource b >> pure (Right ())) Nothing
369+discard = client (\b -> runConduit (b .| Conduit.sinkNull) >> pure (Right ())) Nothing
365370
366371client :: (Stream -> ResourceT IO (Either (String, LBS.ByteString) a))
367372 -> Maybe MediaType
@@ -370,10 +375,10 @@ client :: (Stream -> ResourceT IO (Either (String, LBS.ByteString) a))
370375 -> Request
371376 -> ServiceConfig
372377 -> Client a
373−client f cs m ns rq s = Client
378+client f cs m statuses rq s = Client
374379 { _cliAccept = cs
375380 , _cliMethod = m
376− , _cliCheck = (`elem` ns) . fromEnum
381+ , _cliCheck = \status -> fromEnum status `elem` statuses
377382 , _cliService = s
378383 , _cliRequest = rq
379384 , _cliResponse = f
@@ -603,7 +608,7 @@ instance {-# OVERLAPPING #-}
603608 buildClient Proxy = discard methodDelete [204]
604609
605610sinkLBS :: Stream -> ResourceT IO LBS.ByteString
606−sinkLBS = fmap LBS.fromChunks . ($$+- CL.consume)
611+sinkLBS = runConduit . (.| Conduit.sinkLazy)
607612
608613buildText :: ToHttpApiData a => a -> Builder
609614buildText = Build.fromText . toQueryParam
examples/src/Example/Storage.hs+3−3
@@ -15,7 +15,7 @@ module Example.Storage where
1515import Control.Lens ((&), (.~), (<&>), (?~))
1616import Control.Monad.Trans.Resource (liftResourceT, runResourceT)
1717
18−import Data.Conduit (($$+-))
18+import Data.Conduit (runConduit, (.|))
1919import Data.Text (Text)
2020
2121import System.IO (stdout)
@@ -62,7 +62,7 @@ example bucket input output = do
6262 -- Download from the bucket/key and create a source of the HTTP stream:
6363 stream <- Google.download (Storage.objectsGet bucket key)
6464
65− -- 'Conduit' actions such as '$$+-' need to be lifted into the 'Google'
65+ -- 'Conduit' actions such as '.|' need to be lifted into the 'Google'
6666 -- monad using 'liftResourceT', this will stream the received bytes
6767 -- into the 'output' file:
68− liftResourceT (stream $$+- Conduit.sinkFile output)
68+ liftResourceT (runConduit (stream .| Conduit.sinkFile output))
gen/.stylish-haskell.yaml+7−3
@@ -4,12 +4,16 @@ steps:
44 - language_pragmas:
55 style: vertical
66 remove_redundant: true
7− - records: {}
7+ - simple_align:
8+ cases: true
9+ top_level_patterns: true
10+ records: true
811 - trailing_whitespace: {}
912
10−columns: 80
13+# In recent stylish-haskell versions, record fields do not get aligned at all if any one of the fields length exceeds columns, so we pad it out from 80.
14+columns: 140
1115
1216language_extensions:
1317 - MultiParamTypeClasses
1418 - TypeOperators
15− - DataKinds
19+ - DataKinds
gen/annex/dns.json+49−2
@@ -1,5 +1,52 @@
11{
22 "library": "dns",
3− "canonicalName": "DNS"
3+ "canonicalName": "DNS",
4+ "schemas": {
5+ "DnsResponseHeader": {
6+ "id": "DnsResponseHeader",
7+ "type": "object",
8+ "description": "Elements common to every response.",
9+ "properties": {
10+ "operationId": {
11+ "type": "string",
12+ "description": "For mutating operation requests that completed successfully. This is the client_operation_id if the client specified it, otherwise it is generated by the server (output only)."
13+ }
14+ }
15+ },
16+ "ChangesListResponse": {
17+ "header": {
18+ "$ref": "DnsResponseHeader"
19+ }
20+ },
21+ "DnsKeysListResponse": {
22+ "header": {
23+ "$ref": "DnsResponseHeader"
24+ }
25+ },
26+ "ManagedZoneOperationsListResponse": {
27+ "header": {
28+ "$ref": "DnsResponseHeader"
29+ }
30+ },
31+ "ManagedZonesDeleteResponse": {
32+ "header": {
33+ "$ref": "DnsResponseHeader"
34+ }
35+ },
36+ "ManagedZonesListResponse": {
37+ "header": {
38+ "$ref": "DnsResponseHeader"
39+ }
40+ },
41+ "ResourceRecordSetsListResponse": {
42+ "header": {
43+ "$ref": "DnsResponseHeader"
44+ }
45+ },
46+ "DnsResponseHeader": {
47+ "header": {
48+ "$ref": "DnsResponseHeader"
49+ }
50+ }
51+ }
452}
5−
gen/gogol-gen.cabal+1−1
@@ -60,7 +60,7 @@ executable gogol-gen
6060 , lens
6161 , mtl
6262 , optparse-applicative
63− , pandoc
63+ , pandoc < 2.0
6464 , parsec
6565 , semigroups
6666 , system-fileio
gen/model/dns/v2beta1/dns-api.json+8−8
@@ -148,7 +148,7 @@
148148 }
149149 },
150150 "header": {
151− "$ref": "ResponseHeader"
151+ "$ref": "DnsResponseHeader"
152152 },
153153 "kind": {
154154 "type": "string",
@@ -324,7 +324,7 @@
324324 }
325325 },
326326 "header": {
327− "$ref": "ResponseHeader"
327+ "$ref": "DnsResponseHeader"
328328 },
329329 "kind": {
330330 "type": "string",
@@ -434,7 +434,7 @@
434434 "type": "object",
435435 "properties": {
436436 "header": {
437− "$ref": "ResponseHeader"
437+ "$ref": "DnsResponseHeader"
438438 },
439439 "kind": {
440440 "type": "string",
@@ -459,7 +459,7 @@
459459 "type": "object",
460460 "properties": {
461461 "header": {
462− "$ref": "ResponseHeader"
462+ "$ref": "DnsResponseHeader"
463463 }
464464 }
465465 },
@@ -468,7 +468,7 @@
468468 "type": "object",
469469 "properties": {
470470 "header": {
471− "$ref": "ResponseHeader"
471+ "$ref": "DnsResponseHeader"
472472 },
473473 "kind": {
474474 "type": "string",
@@ -687,7 +687,7 @@
687687 "type": "object",
688688 "properties": {
689689 "header": {
690− "$ref": "ResponseHeader"
690+ "$ref": "DnsResponseHeader"
691691 },
692692 "kind": {
693693 "type": "string",
@@ -707,8 +707,8 @@
707707 }
708708 }
709709 },
710− "ResponseHeader": {
711− "id": "ResponseHeader",
710+ "DnsResponseHeader": {
711+ "id": "DnsResponseHeader",
712712 "type": "object",
713713 "description": "Elements common to every response.",
714714 "properties": {
gen/src/Gen/Formatting.hs+1−1
@@ -10,8 +10,8 @@
1010module Gen.Formatting
1111 ( module Gen.Formatting
1212 , module Formatting
13+ , module Formatting.Internal
1314 , module Formatting.Time
14− , runFormat
1515 ) where
1616
1717import Control.Monad.Except
gen/src/Gen/IO.hs+10−4
@@ -13,19 +13,25 @@ module Gen.IO where
1313
1414import Control.Error
1515import Control.Monad.Except
16+
1617import Data.Bifunctor (first)
1718import Data.ByteString (ByteString)
18−import qualified Data.Text.Lazy as LText
1919import Data.Text.Lazy.Builder (toLazyText)
20−import qualified Data.Text.Lazy.IO as LText
21−import qualified Filesystem as FS
20+
2221import Filesystem.Path.CurrentOS
22+
2323import Gen.Formatting
2424import Gen.Types
25+
2526import System.IO
26−import qualified Text.EDE as EDE
27+
2728import UnexceptionalIO (fromIO, runUIO)
2829
30+import qualified Data.Text.Lazy as LText
31+import qualified Data.Text.Lazy.IO as LText
32+import qualified Filesystem as FS
33+import qualified Text.EDE as EDE
34+
2935run :: ExceptT Error IO a -> IO a
3036run = runScript . fmapLT LText.unpack
3137
gen/src/Gen/Types/Help.hs+26−24
@@ -15,30 +15,33 @@ module Gen.Types.Help
1515 , rawHelpText
1616 ) where
1717
18−import Data.Aeson
19−import Data.Char (isSpace)
20−import Data.String
21−import Data.Text (Text)
22−import qualified Data.Text as Text
23−import Text.Pandoc
24−import Text.Pandoc.Pretty
18+import Data.Aeson
19+import Data.Char (isSpace)
20+import Data.String
21+import Data.Text (Text)
22+import qualified Data.Text as T
23+
24+import Text.Pandoc as Pandoc
25+import Text.Pandoc.Pretty
26+
27+import qualified Data.Text as Text
2528
2629data Help
27− = Help [Help]
28− | Pan Pandoc
29− | Raw Text
30+ = Help ![Help]
31+ | Pan !Pandoc !Text
32+ | Raw !Text
3033 deriving (Eq)
3134
3235instance Monoid Help where
3336 mempty = Help []
3437 mappend x y =
3538 case (x, y) of
36− (Help a, Help b) -> Help (a <> b)
37− (Pan a, Pan b) -> Pan (a <> b)
38− (Raw a, Raw b) -> Raw (a <> b)
39− (Help a, b) -> Help (a <> [b])
40− (a, Help b) -> Help (a : b)
41− (a, b) -> Help [a, b]
39+ (Help a, Help b) -> Help (a <> b)
40+ (Pan a a', Pan b b') -> Pan (a <> b) (a' <> b')
41+ (Raw a, Raw b) -> Raw (a <> b)
42+ (Help a, b) -> Help (a <> [b])
43+ (a, Help b) -> Help (a : b)
44+ (a, b) -> Help [a, b]
4245
4346-- | Empty Show instance to avoid verbose debugging output.
4447instance Show Help where
@@ -51,11 +54,10 @@ rawHelpText :: Text -> Help
5154rawHelpText = Raw
5255
5356instance FromJSON Help where
54− parseJSON = withText "help" $
55− either (fail . show) pure
56− . fmap Pan
57− . readHtml def
58− . Text.unpack
57+ parseJSON = withText "help" $ \t ->
58+ case Pandoc.readHtml def (T.unpack t) of
59+ Left e -> fail (show e)
60+ Right x -> pure $! Pan x t
5961
6062instance ToJSON Help where
6163 toJSON = toJSON
@@ -80,9 +82,9 @@ instance ToJSON Below where
8082
8183flatten :: Help -> String
8284flatten = \case
83− Help xs -> foldMap flatten xs
84− Pan d -> writeHaddock def d
85− Raw t -> Text.unpack t
85+ Help xs -> foldMap flatten xs
86+ Raw t -> Text.unpack t
87+ Pan d _t -> Pandoc.writeHaddock def d
8688
8789wrap :: String -> String -> Text
8890wrap sep =
gen/stack.yaml−5
@@ -1,4 +1,3 @@
1−compiler: ghc-8.0.2
21resolver: lts-8.18
32
43flags: {}
@@ -10,7 +9,3 @@ extra-deps:
109
1110packages:
1211 - '.'
13−
14−nix:
15− enable: true
16− packages: [zlib, icu]
gogol-dns/gen/Network/Google/DNS.hs+5−5
@@ -135,6 +135,11 @@ module Network.Google.DNS
135135 , oZoneContext
136136 , oDNSKeyContext
137137
138+ -- ** DNSResponseHeader
139+ , DNSResponseHeader
140+ , dnsResponseHeader
141+ , drhOperationId
142+
138143 -- ** DNSKeySpec
139144 , DNSKeySpec
140145 , dnsKeySpec
@@ -187,11 +192,6 @@ module Network.Google.DNS
187192 -- ** DNSKeyAlgorithm
188193 , DNSKeyAlgorithm (..)
189194
190− -- ** ResponseHeader
191− , ResponseHeader
192− , responseHeader
193− , rhOperationId
194−
195195 -- ** DNSKeySpecKeyType
196196 , DNSKeySpecKeyType (..)
197197
gogol-dns/gen/Network/Google/DNS/Types.hs+5−5
@@ -81,6 +81,11 @@ module Network.Google.DNS.Types
8181 , oZoneContext
8282 , oDNSKeyContext
8383
84+ -- * DNSResponseHeader
85+ , DNSResponseHeader
86+ , dnsResponseHeader
87+ , drhOperationId
88+
8489 -- * DNSKeySpec
8590 , DNSKeySpec
8691 , dnsKeySpec
@@ -133,11 +138,6 @@ module Network.Google.DNS.Types
133138 -- * DNSKeyAlgorithm
134139 , DNSKeyAlgorithm (..)
135140
136− -- * ResponseHeader
137− , ResponseHeader
138− , responseHeader
139− , rhOperationId
140−
141141 -- * DNSKeySpecKeyType
142142 , DNSKeySpecKeyType (..)
143143
gogol-dns/gen/Network/Google/DNS/Types/Product.hs+49−49
@@ -73,7 +73,7 @@ data DNSKeysListResponse = DNSKeysListResponse'
7373 { _dklrNextPageToken :: !(Maybe Text)
7474 , _dklrDNSKeys :: !(Maybe [DNSKey])
7575 , _dklrKind :: !Text
76− , _dklrHeader :: !(Maybe ResponseHeader)
76+ , _dklrHeader :: !(Maybe DNSResponseHeader)
7777 } deriving (Eq,Show,Data,Typeable,Generic)
7878
7979-- | Creates a value of 'DNSKeysListResponse' with the minimum fields required to make a request.
@@ -122,7 +122,7 @@ dklrDNSKeys
122122dklrKind :: Lens' DNSKeysListResponse Text
123123dklrKind = lens _dklrKind (\ s a -> s{_dklrKind = a})
124124
125−dklrHeader :: Lens' DNSKeysListResponse (Maybe ResponseHeader)
125+dklrHeader :: Lens' DNSKeysListResponse (Maybe DNSResponseHeader)
126126dklrHeader
127127 = lens _dklrHeader (\ s a -> s{_dklrHeader = a})
128128
@@ -153,7 +153,7 @@ data ChangesListResponse = ChangesListResponse'
153153 { _clrNextPageToken :: !(Maybe Text)
154154 , _clrChanges :: !(Maybe [Change])
155155 , _clrKind :: !Text
156− , _clrHeader :: !(Maybe ResponseHeader)
156+ , _clrHeader :: !(Maybe DNSResponseHeader)
157157 } deriving (Eq,Show,Data,Typeable,Generic)
158158
159159-- | Creates a value of 'ChangesListResponse' with the minimum fields required to make a request.
@@ -202,7 +202,7 @@ clrChanges
202202clrKind :: Lens' ChangesListResponse Text
203203clrKind = lens _clrKind (\ s a -> s{_clrKind = a})
204204
205−clrHeader :: Lens' ChangesListResponse (Maybe ResponseHeader)
205+clrHeader :: Lens' ChangesListResponse (Maybe DNSResponseHeader)
206206clrHeader
207207 = lens _clrHeader (\ s a -> s{_clrHeader = a})
208208
@@ -228,7 +228,7 @@ instance ToJSON ChangesListResponse where
228228--
229229-- /See:/ 'managedZonesDeleteResponse' smart constructor.
230230newtype ManagedZonesDeleteResponse = ManagedZonesDeleteResponse'
231− { _mzdrHeader :: Maybe ResponseHeader
231+ { _mzdrHeader :: Maybe DNSResponseHeader
232232 } deriving (Eq,Show,Data,Typeable,Generic)
233233
234234-- | Creates a value of 'ManagedZonesDeleteResponse' with the minimum fields required to make a request.
@@ -243,7 +243,7 @@ managedZonesDeleteResponse =
243243 { _mzdrHeader = Nothing
244244 }
245245
246−mzdrHeader :: Lens' ManagedZonesDeleteResponse (Maybe ResponseHeader)
246+mzdrHeader :: Lens' ManagedZonesDeleteResponse (Maybe DNSResponseHeader)
247247mzdrHeader
248248 = lens _mzdrHeader (\ s a -> s{_mzdrHeader = a})
249249
@@ -447,6 +447,43 @@ instance ToJSON Operation where
447447 ("zoneContext" .=) <$> _oZoneContext,
448448 ("dnsKeyContext" .=) <$> _oDNSKeyContext])
449449
450+-- | Elements common to every response.
451+--
452+-- /See:/ 'dnsResponseHeader' smart constructor.
453+newtype DNSResponseHeader = DNSResponseHeader'
454+ { _drhOperationId :: Maybe Text
455+ } deriving (Eq,Show,Data,Typeable,Generic)
456+
457+-- | Creates a value of 'DNSResponseHeader' with the minimum fields required to make a request.
458+--
459+-- Use one of the following lenses to modify other fields as desired:
460+--
461+-- * 'drhOperationId'
462+dnsResponseHeader
463+ :: DNSResponseHeader
464+dnsResponseHeader =
465+ DNSResponseHeader'
466+ { _drhOperationId = Nothing
467+ }
468+
469+-- | For mutating operation requests that completed successfully. This is the
470+-- client_operation_id if the client specified it, otherwise it is
471+-- generated by the server (output only).
472+drhOperationId :: Lens' DNSResponseHeader (Maybe Text)
473+drhOperationId
474+ = lens _drhOperationId
475+ (\ s a -> s{_drhOperationId = a})
476+
477+instance FromJSON DNSResponseHeader where
478+ parseJSON
479+ = withObject "DNSResponseHeader"
480+ (\ o -> DNSResponseHeader' <$> (o .:? "operationId"))
481+
482+instance ToJSON DNSResponseHeader where
483+ toJSON DNSResponseHeader'{..}
484+ = object
485+ (catMaybes [("operationId" .=) <$> _drhOperationId])
486+
450487-- | Parameters for DnsKey key generation. Used for generating initial keys
451488-- for a new ManagedZone and as default when adding a new DnsKey.
452489--
@@ -840,49 +877,12 @@ instance ToJSON OperationManagedZoneContext where
840877 [("oldValue" .=) <$> _omzcOldValue,
841878 ("newValue" .=) <$> _omzcNewValue])
842879
843−-- | Elements common to every response.
844−--
845−-- /See:/ 'responseHeader' smart constructor.
846−newtype ResponseHeader = ResponseHeader'
847− { _rhOperationId :: Maybe Text
848− } deriving (Eq,Show,Data,Typeable,Generic)
849−
850−-- | Creates a value of 'ResponseHeader' with the minimum fields required to make a request.
851−--
852−-- Use one of the following lenses to modify other fields as desired:
853−--
854−-- * 'rhOperationId'
855−responseHeader
856− :: ResponseHeader
857−responseHeader =
858− ResponseHeader'
859− { _rhOperationId = Nothing
860− }
861−
862−-- | For mutating operation requests that completed successfully. This is the
863−-- client_operation_id if the client specified it, otherwise it is
864−-- generated by the server (output only).
865−rhOperationId :: Lens' ResponseHeader (Maybe Text)
866−rhOperationId
867− = lens _rhOperationId
868− (\ s a -> s{_rhOperationId = a})
869−
870−instance FromJSON ResponseHeader where
871− parseJSON
872− = withObject "ResponseHeader"
873− (\ o -> ResponseHeader' <$> (o .:? "operationId"))
874−
875−instance ToJSON ResponseHeader where
876− toJSON ResponseHeader'{..}
877− = object
878− (catMaybes [("operationId" .=) <$> _rhOperationId])
879−
880880--
881881-- /See:/ 'managedZoneOperationsListResponse' smart constructor.
882882data ManagedZoneOperationsListResponse = ManagedZoneOperationsListResponse'
883883 { _mzolrNextPageToken :: !(Maybe Text)
884884 , _mzolrKind :: !Text
885− , _mzolrHeader :: !(Maybe ResponseHeader)
885+ , _mzolrHeader :: !(Maybe DNSResponseHeader)
886886 , _mzolrOperations :: !(Maybe [Operation])
887887 } deriving (Eq,Show,Data,Typeable,Generic)
888888
@@ -926,7 +926,7 @@ mzolrKind :: Lens' ManagedZoneOperationsListResponse Text
926926mzolrKind
927927 = lens _mzolrKind (\ s a -> s{_mzolrKind = a})
928928
929−mzolrHeader :: Lens' ManagedZoneOperationsListResponse (Maybe ResponseHeader)
929+mzolrHeader :: Lens' ManagedZoneOperationsListResponse (Maybe DNSResponseHeader)
930930mzolrHeader
931931 = lens _mzolrHeader (\ s a -> s{_mzolrHeader = a})
932932
@@ -965,7 +965,7 @@ instance ToJSON ManagedZoneOperationsListResponse
965965data ResourceRecordSetsListResponse = ResourceRecordSetsListResponse'
966966 { _rrslrNextPageToken :: !(Maybe Text)
967967 , _rrslrKind :: !Text
968− , _rrslrHeader :: !(Maybe ResponseHeader)
968+ , _rrslrHeader :: !(Maybe DNSResponseHeader)
969969 , _rrslrRrSets :: !(Maybe [ResourceRecordSet])
970970 } deriving (Eq,Show,Data,Typeable,Generic)
971971
@@ -1009,7 +1009,7 @@ rrslrKind :: Lens' ResourceRecordSetsListResponse Text
10091009rrslrKind
10101010 = lens _rrslrKind (\ s a -> s{_rrslrKind = a})
10111011
1012−rrslrHeader :: Lens' ResourceRecordSetsListResponse (Maybe ResponseHeader)
1012+rrslrHeader :: Lens' ResourceRecordSetsListResponse (Maybe DNSResponseHeader)
10131013rrslrHeader
10141014 = lens _rrslrHeader (\ s a -> s{_rrslrHeader = a})
10151015
@@ -1557,7 +1557,7 @@ instance ToJSON DNSKeyDigest where
15571557data ManagedZonesListResponse = ManagedZonesListResponse'
15581558 { _mzlrNextPageToken :: !(Maybe Text)
15591559 , _mzlrKind :: !Text
1560− , _mzlrHeader :: !(Maybe ResponseHeader)
1560+ , _mzlrHeader :: !(Maybe DNSResponseHeader)
15611561 , _mzlrManagedZones :: !(Maybe [ManagedZone])
15621562 } deriving (Eq,Show,Data,Typeable,Generic)
15631563
@@ -1600,7 +1600,7 @@ mzlrNextPageToken
16001600mzlrKind :: Lens' ManagedZonesListResponse Text
16011601mzlrKind = lens _mzlrKind (\ s a -> s{_mzlrKind = a})
16021602
1603−mzlrHeader :: Lens' ManagedZonesListResponse (Maybe ResponseHeader)
1603+mzlrHeader :: Lens' ManagedZonesListResponse (Maybe DNSResponseHeader)
16041604mzlrHeader
16051605 = lens _mzlrHeader (\ s a -> s{_mzlrHeader = a})
16061606
gogol/gogol.cabal+3−4
@@ -68,19 +68,18 @@ library
6868 , filepath >= 1.2
6969 , gogol-core == 0.3.0.*
7070 , http-client >= 0.5 && < 1
71− , http-conduit >= 2.2 && < 3
71+ , http-conduit >= 2.3 && < 3
7272 , http-media >= 0.6
7373 , http-types >= 0.8.6
7474 , lens >= 4.4
7575 , memory >= 0.8
7676 , mime-types >= 0.1
77− , monad-control >= 1
7877 , mtl >= 2.1.3.1
7978 , resourcet >= 1.1
8079 , text >= 1.1
8180 , time >= 1.2
8281 , transformers >= 0.2
83− , transformers-base >= 0.4
82+ , unliftio-core >= 0.1
8483 , unordered-containers >= 0.2.5
8584 , x509 >= 1.5
86− , x509-store >= 1.5
85+ , x509-store >= 1.5
gogol/src/Network/Google.hs+32−32
@@ -114,32 +114,33 @@ module Network.Google
114114 , module Network.Google.Types
115115 ) where
116116
117−import Control.Applicative
118−import Control.Exception.Lens
119−import Control.Monad
120−import Control.Monad.Base
121−import Control.Monad.Catch
122−import Control.Monad.Reader
123−import qualified Control.Monad.RWS.Lazy as LRW
124−import qualified Control.Monad.RWS.Strict as RW
125−import qualified Control.Monad.State.Lazy as LS
126−import qualified Control.Monad.State.Strict as S
127−import Control.Monad.Trans.Control
128−import Control.Monad.Trans.Except (ExceptT)
129−import Control.Monad.Trans.Identity (IdentityT)
130−import Control.Monad.Trans.List (ListT)
131−import Control.Monad.Trans.Maybe (MaybeT)
132−import Control.Monad.Trans.Resource
133−import qualified Control.Monad.Writer.Lazy as LW
134−import qualified Control.Monad.Writer.Strict as W
135−import Network.Google.Auth
136−import Network.Google.Env
137−import Network.Google.Internal.Body
138−import Network.Google.Internal.HTTP
139−import Network.Google.Internal.Logger
140−import Network.Google.Prelude
141−import Network.Google.Types
142−import Network.HTTP.Conduit (newManager, tlsManagerSettings)
117+import Control.Applicative
118+import Control.Exception.Lens
119+import Control.Monad
120+import Control.Monad.Catch
121+import Control.Monad.IO.Unlift (MonadUnliftIO (withRunInIO))
122+import Control.Monad.Reader
123+import Control.Monad.Trans.Except (ExceptT)
124+import Control.Monad.Trans.Identity (IdentityT)
125+import Control.Monad.Trans.List (ListT)
126+import Control.Monad.Trans.Maybe (MaybeT)
127+import Control.Monad.Trans.Resource
128+
129+import Network.Google.Auth
130+import Network.Google.Env
131+import Network.Google.Internal.Body
132+import Network.Google.Internal.HTTP
133+import Network.Google.Internal.Logger
134+import Network.Google.Prelude
135+import Network.Google.Types
136+import Network.HTTP.Conduit (newManager, tlsManagerSettings)
137+
138+import qualified Control.Monad.Writer.Lazy as LW
139+import qualified Control.Monad.Writer.Strict as W
140+import qualified Control.Monad.RWS.Lazy as LRW
141+import qualified Control.Monad.RWS.Strict as RW
142+import qualified Control.Monad.State.Lazy as LS
143+import qualified Control.Monad.State.Strict as S
143144
144145-- | The 'Google' monad containing configuration environment and tracks
145146-- resource allocation via 'ResourceT'.
@@ -155,7 +156,6 @@ newtype Google s a = Google { unGoogle :: ReaderT (Env s) (ResourceT IO) a }
155156 , MonadThrow
156157 , MonadCatch
157158 , MonadMask
158− , MonadBase IO
159159 , MonadReader (Env s)
160160 , MonadResource
161161 )
@@ -183,11 +183,11 @@ class ( Functor m
183183instance AllowScopes s => MonadGoogle s (Google s) where
184184 liftGoogle = id
185185
186−instance MonadBaseControl IO (Google s) where
187− type StM (Google s) a = StM (ReaderT (Env s) (ResourceT IO)) a
188−
189− liftBaseWith f = Google $ liftBaseWith $ \g -> f (g . unGoogle)
190− restoreM = Google . restoreM
186+instance MonadUnliftIO (Google s) where
187+ withRunInIO inner =
188+ Google $ withRunInIO $ \run ->
189+ inner (run . unGoogle)
190+ {-# INLINE withRunInIO #-}
191191
192192instance MonadGoogle s m => MonadGoogle s (IdentityT m) where
193193 liftGoogle = lift . liftGoogle
gogol/src/Network/Google/Internal/HTTP.hs+26−22
@@ -15,27 +15,31 @@
1515--
1616module Network.Google.Internal.HTTP where
1717
18−import Control.Lens ((%~), (&))
19−import Control.Monad.Catch
20−import Control.Monad.IO.Class (MonadIO)
21−import Control.Monad.Trans.Resource (MonadResource (..))
22−import qualified Data.ByteString.Lazy as LBS
23−import Data.Conduit (($$+-))
24−import qualified Data.Conduit.List as Conduit
25−import Data.Monoid (Dual (..), Endo (..), (<>))
26−import qualified Data.Text.Encoding as Text
27−import qualified Data.Text.Lazy as LText
28−import qualified Data.Text.Lazy.Builder as Build
29−import GHC.Exts (toList)
30−import Network.Google.Auth (AllowScopes, authorize)
31−import Network.Google.Env (Env (..))
32−import Network.Google.Internal.Logger (logDebug)
33−import Network.Google.Internal.Multipart
34−import Network.Google.Types
35−import qualified Network.HTTP.Client.Conduit as Client
36−import Network.HTTP.Conduit
37−import Network.HTTP.Media (RenderHeader (..))
38−import Network.HTTP.Types
18+import Control.Lens ((%~), (&))
19+import Control.Monad.Catch
20+import Control.Monad.IO.Class (MonadIO)
21+import Control.Monad.Trans.Resource (MonadResource (..))
22+
23+import Data.Conduit (($$+-))
24+import Data.Monoid (Dual (..), Endo (..), (<>))
25+
26+import GHC.Exts (toList)
27+
28+import Network.Google.Auth (AllowScopes, authorize)
29+import Network.Google.Env (Env (..))
30+import Network.Google.Internal.Logger (logDebug)
31+import Network.Google.Internal.Multipart
32+import Network.Google.Types
33+import Network.HTTP.Conduit
34+import Network.HTTP.Media (RenderHeader (..))
35+import Network.HTTP.Types
36+
37+import qualified Data.ByteString.Lazy as LBS
38+import qualified Data.Conduit.List as Conduit
39+import qualified Data.Text.Encoding as Text
40+import qualified Data.Text.Lazy as LText
41+import qualified Data.Text.Lazy.Builder as Build
42+import qualified Network.HTTP.Client.Conduit as Client
3943
4044-- FIXME: "mediaType" param also comes/calculated from the request body?
4145--
@@ -103,7 +107,7 @@ perform Env{..} x = catches go handlers
103107 statusCheck rs
104108 | _cliCheck (responseStatus rs) = pure ()
105109 | otherwise = do
106− b <- LBS.fromChunks <$> (responseBody rs $$+- Conduit.consume)
110+ b <- sinkLBS (responseBody rs)
107111 throwM . toException . ServiceError $ ServiceError'
108112 { _serviceId = _svcId
109113 , _serviceStatus = responseStatus rs
stack-7.10.3.yaml+11−3
@@ -1,10 +1,18 @@
1−compiler: ghc-7.10.3
2−resolver: lts-7.6
3−flags: {}
1+compiler: ghc-7.10.3
2+resolver: lts-7.6
3+
4+local-bin-path: bin
5+
6+nix:
7+ enable: false
8+ packages: [zlib, icu]
9+ add-gc-roots: true
10+
411extra-deps:
512 - http-conduit-2.2.0
613 - http-client-0.5.0.1
714 - http-client-tls-0.3.0
15+
816packages:
917 - core
1018 - gogol
stack-8.0.2.yaml+10−4
@@ -1,7 +1,13 @@
1−compiler: ghc-8.0.2
2−resolver: lts-9.0
3−flags: {}
4−extra-deps: []
1+compiler: ghc-8.0.2
2+resolver: lts-9.0
3+
4+local-bin-path: bin
5+
6+nix:
7+ enable: false
8+ packages: [zlib, icu]
9+ add-gc-roots: true
10+
511packages:
612 - core
713 - gogol
stack-8.2.yaml → stack-8.2.2.yamlrenamed+10−3
@@ -1,7 +1,14 @@
1−compiler: ghc-8.2
2−resolver: nightly-2017-08-12
3−flags: {}
1+resolver: lts-12.24
2+
3+local-bin-path: bin
4+
5+nix:
6+ enable: false
7+ packages: [zlib, icu, unzip]
8+ add-gc-roots: true
9+
410extra-deps: []
11+
512packages:
613 - core
714 - gogol
stack.yaml+1−1
@@ -1 +1 @@
1−stack-8.2.yaml
1+stack-8.2.2.yaml