Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@freizl
freizl committed Apr 5, 2017
2 parents f84183a + 9f53f34 commit d00e43a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c)2012, Haisheng Wu
Copyright (c)2012-2017, Haisheng Wu

All rights reserved.

Expand Down
43 changes: 22 additions & 21 deletions hoauth2.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ Source-Repository head
Location: git://github.com/freizl/hoauth2.git

Flag test
Description: Build the executables
Default: False
Description: Build the executables
Default: False

Library
hs-source-dirs: src
Expand All @@ -59,12 +59,13 @@ Library

Build-Depends:
base >= 4 && < 5,
aeson >= 1.1 && < 1.2,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
http-types >= 0.9 && < 0.10,
unordered-containers >=0.2.5
aeson >= 0.11 && < 1.2,
unordered-containers >= 0.2.5


if impl(ghc >= 6.12.0)
ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
Expand All @@ -83,9 +84,10 @@ Executable test-weibo
default-language: Haskell2010
build-depends: base >= 4.5 && < 5,
http-types >= 0.9 && < 0.10,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
aeson >= 0.11 && < 1.1,
hoauth2

if impl(ghc >= 6.12.0)
Expand All @@ -106,10 +108,10 @@ Executable test-google
default-language: Haskell2010
build-depends: base >= 4.5 && < 5,
http-types >= 0.9 && < 0.10,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
aeson >= 1.1 && < 1.2,
aeson >= 0.11 && < 1.2,
hoauth2

if impl(ghc >= 6.12.0)
Expand All @@ -130,10 +132,10 @@ Executable test-github
default-language: Haskell2010
build-depends: base >= 4.5 && < 5,
http-types >= 0.9 && < 0.10,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
aeson >= 1.1 && < 1.2,
aeson >= 0.11 && < 1.2,
hoauth2

if impl(ghc >= 6.12.0)
Expand All @@ -153,10 +155,10 @@ Executable test-douban
default-language: Haskell2010
build-depends: base >= 4.5 && < 5,
http-types >= 0.9 && < 0.10,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
aeson >= 1.1 && < 1.2,
aeson >= 0.11 && < 1.2,
hoauth2

if impl(ghc >= 6.12.0)
Expand All @@ -176,10 +178,10 @@ Executable test-facebook
default-language: Haskell2010
build-depends: base >= 4.5 && < 5,
http-types >= 0.9 && < 0.10,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
aeson >= 1.1 && < 1.2,
aeson >= 0.11 && < 1.2,
hoauth2

if impl(ghc >= 6.12.0)
Expand All @@ -200,12 +202,12 @@ Executable test-fitbit
build-depends: base >= 4.5 && < 5,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
http-types >= 0.9 && < 0.10,
wai >= 3.2 && < 3.3,
warp >= 3.2 && < 3.3,
containers >= 0.4 && < 0.6,
aeson >= 1.1 && < 1.2,
aeson >= 0.11 && < 1.2,
hoauth2


Expand All @@ -226,10 +228,10 @@ Executable test-stackexchange
default-language: Haskell2010
build-depends: base >= 4.5 && < 5,
http-types >= 0.9 && < 0.10,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
aeson >= 1.1 && < 1.2,
aeson >= 0.11 && < 1.2,
hoauth2

if impl(ghc >= 6.12.0)
Expand All @@ -249,15 +251,14 @@ Executable test-dropbox
default-language: Haskell2010
build-depends: base >= 4.5 && < 5,
http-types >= 0.9 && < 0.10,
http-conduit >= 2.2 && < 2.3,
http-conduit >= 2.1 && < 2.3,
text >= 0.11 && < 1.3,
bytestring >= 0.9 && < 0.11,
aeson >= 1.1 && < 1.2,
aeson >= 0.11 && < 1.2,
hoauth2

if impl(ghc >= 6.12.0)
ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
-fno-warn-unused-do-bind
else
ghc-options: -Wall -fwarn-tabs -funbox-strict-fields

2 changes: 1 addition & 1 deletion stack.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md

# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
resolver: nightly-2016-09-24
resolver: lts-7.18

# Local packages, usually specified by relative directory name
packages:
Expand Down

0 comments on commit d00e43a

Please sign in to comment.