Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with GHC 9.8.2 and base64 1.0 release #193

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/gogol-examples.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ library
, bytestring
, conduit
, conduit-extra
, gogol >=0.5.0 && <0.5.1
, gogol >=0.5.0
, gogol-core
, gogol-sheets
, gogol-storage
Expand Down
2 changes: 1 addition & 1 deletion examples/src/Example/Sheets.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Control.Lens ((.~), (<&>))
import Data.Aeson.Types
import Data.Text (Text)
import Gogol
import Gogol.Resource.Sheets.Spreadsheets.Get
import Gogol.Sheets.Spreadsheets.Get
import Gogol.Sheets
import System.IO (stdout)

Expand Down
13 changes: 7 additions & 6 deletions lib/gogol-core/src/Gogol/Data/Base64.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import Control.Lens (Iso', iso)
import Data.Aeson (FromJSON (..), ToJSON (..))
import Data.ByteString (ByteString)
import qualified Data.ByteString.Base64 as Base64
import qualified Data.Base64.Types as Base64
import Data.Hashable
import qualified Data.Text.Encoding as Text
import GHC.Generics (Generic)
Expand All @@ -33,14 +34,14 @@ _Base64 :: Iso' Base64 ByteString
_Base64 = iso fromBase64 Base64

instance ToHttpApiData Base64 where
toUrlPiece = Base64.encodeBase64 . fromBase64
toQueryParam = Base64.encodeBase64 . fromBase64
toHeader = Base64.encodeBase64' . fromBase64
toUrlPiece = Base64.extractBase64 . Base64.encodeBase64 . fromBase64
toQueryParam = Base64.extractBase64 . Base64.encodeBase64 . fromBase64
toHeader = Base64.extractBase64 . Base64.encodeBase64' . fromBase64

instance FromHttpApiData Base64 where
parseUrlPiece = fmap Base64 . Base64.decodeBase64 . Text.encodeUtf8
parseQueryParam = fmap Base64 . Base64.decodeBase64 . Text.encodeUtf8
parseHeader = fmap Base64 . Base64.decodeBase64
parseUrlPiece = fmap Base64 . Base64.decodeBase64Untyped . Text.encodeUtf8
parseQueryParam = fmap Base64 . Base64.decodeBase64Untyped . Text.encodeUtf8
parseHeader = fmap Base64 . Base64.decodeBase64Untyped

instance FromJSON Base64 where
parseJSON = parseJSONText "Base64"
Expand Down
6 changes: 3 additions & 3 deletions lib/gogol/gogol.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ library
, bytestring >=0.9
, case-insensitive >=1.2
, conduit-extra >=1.1
, cryptonite >=0.6
, crypton >=0.34
, directory >=1.2
, exceptions >=0.6
, filepath >=1.2
Expand All @@ -83,5 +83,5 @@ library
, resourcet >=1.1
, text >=1.1
, time >=1.2
, x509 >=1.5
, x509-store >=1.5
, crypton-x509 >=1.5
, crypton-x509-store >=1.5
185 changes: 185 additions & 0 deletions stack-9.8.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
resolver: nightly-2024-07-12

local-bin-path: bin

nix:
enable: false
packages: [zlib, icu]
add-gc-roots: true

extra-deps: []

packages:
- examples
- lib/gogol
- lib/gogol-core
# GENERATED
- lib/services/gogol-abusiveexperiencereport
- lib/services/gogol-acceleratedmobilepageurl
- lib/services/gogol-accessapproval
- lib/services/gogol-accesscontextmanager
- lib/services/gogol-adexchange-buyer
- lib/services/gogol-adexchangebuyer2
- lib/services/gogol-adexchange-seller
- lib/services/gogol-adexperiencereport
- lib/services/gogol-admin-datatransfer
- lib/services/gogol-admin-directory
- lib/services/gogol-admin-reports
- lib/services/gogol-adsense
- lib/services/gogol-adsense-host
- lib/services/gogol-alertcenter
- lib/services/gogol-analytics
- lib/services/gogol-analyticsreporting
- lib/services/gogol-androiddeviceprovisioning
- lib/services/gogol-android-enterprise
- lib/services/gogol-androidmanagement
- lib/services/gogol-android-publisher
- lib/services/gogol-appengine
- lib/services/gogol-apps-activity
- lib/services/gogol-apps-calendar
- lib/services/gogol-apps-licensing
- lib/services/gogol-apps-reseller
- lib/services/gogol-apps-tasks
- lib/services/gogol-appstate
- lib/services/gogol-bigquery
- lib/services/gogol-bigquerydatatransfer
- lib/services/gogol-bigtableadmin
- lib/services/gogol-billing
- lib/services/gogol-binaryauthorization
- lib/services/gogol-blogger
- lib/services/gogol-books
- lib/services/gogol-chat
- lib/services/gogol-civicinfo
- lib/services/gogol-classroom
- lib/services/gogol-cloudasset
- lib/services/gogol-clouderrorreporting
- lib/services/gogol-cloudfunctions
- lib/services/gogol-cloudidentity
- lib/services/gogol-cloudiot
- lib/services/gogol-cloudkms
- lib/services/gogol-cloudprivatecatalog
- lib/services/gogol-cloudprivatecatalogproducer
- lib/services/gogol-cloudprofiler
- lib/services/gogol-cloudscheduler
- lib/services/gogol-cloudsearch
- lib/services/gogol-cloudshell
- lib/services/gogol-cloudtasks
- lib/services/gogol-cloudtrace
- lib/services/gogol-commentanalyzer
- lib/services/gogol-composer
- lib/services/gogol-compute
- lib/services/gogol-consumersurveys
- lib/services/gogol-container
- lib/services/gogol-containeranalysis
- lib/services/gogol-containerbuilder
- lib/services/gogol-customsearch
- lib/services/gogol-dataflow
- lib/services/gogol-datafusion
- lib/services/gogol-dataproc
- lib/services/gogol-datastore
- lib/services/gogol-debugger
- lib/services/gogol-deploymentmanager
- lib/services/gogol-dfareporting
- lib/services/gogol-dialogflow
- lib/services/gogol-digitalassetlinks
- lib/services/gogol-discovery
- lib/services/gogol-dlp
- lib/services/gogol-dns
- lib/services/gogol-docs
- lib/services/gogol-doubleclick-bids
- lib/services/gogol-doubleclick-search
- lib/services/gogol-drive
- lib/services/gogol-driveactivity
- lib/services/gogol-factchecktools
- lib/services/gogol-file
- lib/services/gogol-firebase-dynamiclinks
- lib/services/gogol-firebasehosting
- lib/services/gogol-firebaseremoteconfig
- lib/services/gogol-firebase-rules
- lib/services/gogol-firestore
- lib/services/gogol-fitness
- lib/services/gogol-fonts
- lib/services/gogol-fusiontables
- lib/services/gogol-games
- lib/services/gogol-games-configuration
- lib/services/gogol-games-management
- lib/services/gogol-genomics
- lib/services/gogol-gmail
- lib/services/gogol-groups-migration
- lib/services/gogol-groups-settings
- lib/services/gogol-healthcare
- lib/services/gogol-iam
- lib/services/gogol-iamcredentials
- lib/services/gogol-iap
- lib/services/gogol-identity-toolkit
- lib/services/gogol-indexing
- lib/services/gogol-jobs
- lib/services/gogol-kgsearch
- lib/services/gogol-language
- lib/services/gogol-libraryagent
- lib/services/gogol-logging
- lib/services/gogol-manufacturers
- lib/services/gogol-mirror
- lib/services/gogol-ml
- lib/services/gogol-monitoring
- lib/services/gogol-oauth2
- lib/services/gogol-oslogin
- lib/services/gogol-pagespeed
- lib/services/gogol-partners
- lib/services/gogol-people
- lib/services/gogol-playcustomapp
- lib/services/gogol-play-moviespartner
- lib/services/gogol-plus
- lib/services/gogol-plus-domains
- lib/services/gogol-poly
- lib/services/gogol-proximitybeacon
- lib/services/gogol-pubsub
- lib/services/gogol-qpxexpress
- lib/services/gogol-redis
- lib/services/gogol-remotebuildexecution
- lib/services/gogol-replicapool
- lib/services/gogol-replicapool-updater
- lib/services/gogol-resourcemanager
- lib/services/gogol-run
- lib/services/gogol-runtimeconfig
- lib/services/gogol-safebrowsing
- lib/services/gogol-script
- lib/services/gogol-searchconsole
- lib/services/gogol-securitycenter
- lib/services/gogol-servicebroker
- lib/services/gogol-serviceconsumermanagement
- lib/services/gogol-servicecontrol
- lib/services/gogol-servicemanagement
- lib/services/gogol-servicenetworking
- lib/services/gogol-serviceusage
- lib/services/gogol-serviceuser
- lib/services/gogol-sheets
- lib/services/gogol-shopping-content
- lib/services/gogol-siteverification
- lib/services/gogol-slides
- lib/services/gogol-sourcerepo
- lib/services/gogol-spanner
- lib/services/gogol-spectrum
- lib/services/gogol-speech
- lib/services/gogol-sqladmin
- lib/services/gogol-storage
- lib/services/gogol-storage-transfer
- lib/services/gogol-streetviewpublish
- lib/services/gogol-surveys
- lib/services/gogol-tagmanager
- lib/services/gogol-testing
- lib/services/gogol-texttospeech
- lib/services/gogol-toolresults
- lib/services/gogol-tpu
- lib/services/gogol-tracing
- lib/services/gogol-translate
- lib/services/gogol-urlshortener
- lib/services/gogol-vault
- lib/services/gogol-videointelligence
- lib/services/gogol-vision
- lib/services/gogol-webmaster-tools
- lib/services/gogol-websecurityscanner
- lib/services/gogol-youtube
- lib/services/gogol-youtube-analytics
- lib/services/gogol-youtube-reporting
# END GENERATED
12 changes: 12 additions & 0 deletions stack-9.8.2.yaml.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was autogenerated by Stack.
# You should not edit this file by hand.
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files

packages: []
snapshots:
- completed:
sha256: f594be174cb2b7ca5a2e22adc85de4838e45d2e590791417ad04f9017b9215bf
size: 654063
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/7/12.yaml
original: nightly-2024-07-12
2 changes: 1 addition & 1 deletion stack.yaml
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
size: 617108
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/3/17.yaml
sha256: a78bbd52a6de7cd16d7ba7590d10a2de57438895e66448ca444bd6f3ae16d946
original: nightly-2022-03-17
sha256: f594be174cb2b7ca5a2e22adc85de4838e45d2e590791417ad04f9017b9215bf
size: 654063
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/7/12.yaml
original: nightly-2024-07-12