Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:snapframework/snap

Conflicts:
	test/snap-testsuite.cabal
  • Loading branch information...
commit f2a0c0465a7add3abf2f8407c829ba5252a7fa3a 2 parents 33f8ced + 2791b5c
@mightybyte mightybyte authored
View
4 project_template/barebones/foo.cabal
@@ -19,8 +19,8 @@ Executable projname
bytestring >= 0.9.1 && < 0.11,
MonadCatchIO-transformers >= 0.2.1 && < 0.4,
mtl >= 2 && < 3,
- snap-core >= 0.9.2 && < 0.10,
- snap-server >= 0.9.2 && < 0.10
+ snap-core >= 0.10 && < 0.11,
+ snap-server >= 0.10 && < 0.11
if impl(ghc >= 6.12.0)
ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
View
6 project_template/default/foo.cabal
@@ -26,9 +26,9 @@ Executable projname
MonadCatchIO-transformers >= 0.2.1 && < 0.4,
mtl >= 2 && < 3,
snap >= 0.10 && < 0.11,
- snap-core == 0.9.*,
- snap-server == 0.9.*,
- snap-loader-static == 0.9.*,
+ snap-core >= 0.10 && < 0.11,
+ snap-server >= 0.10 && < 0.11,
+ snap-loader-static >= 0.10 && < 0.11,
text >= 0.11 && < 0.12,
time >= 1.1 && < 1.5,
xmlhtml >= 0.1
View
4 project_template/tutorial/foo.cabal
@@ -21,8 +21,8 @@ Executable projname
MonadCatchIO-transformers >= 0.2.1 && < 0.4,
mtl >= 2 && < 3,
snap >= 0.10 && < 0.11,
- snap-core >= 0.9.2 && < 0.10,
- snap-server >= 0.9.2 && < 0.10
+ snap-core >= 0.10 && < 0.11,
+ snap-server >= 0.10 && < 0.11
if impl(ghc >= 6.12.0)
ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
View
6 snap.cabal
@@ -157,9 +157,9 @@ Library
mtl > 2.0 && < 2.2,
mwc-random >= 0.8 && < 0.13,
pwstore-fast >= 2.2 && < 2.4,
- regex-posix >= 0.95 && < 1,
- snap-core >= 0.9.2 && < 0.10,
- snap-server >= 0.9.2 && < 0.10,
+ regex-posix >= 0.95 && < 1,
+ snap-core >= 0.10 && < 0.11,
+ snap-server >= 0.10 && < 0.11,
stm >= 2.2 && < 2.5,
syb >= 0.1 && < 0.4,
text >= 0.11 && < 0.12,
View
58 test/snap-testsuite.cabal
@@ -35,9 +35,9 @@ Executable snap-testsuite
mwc-random >= 0.8,
process == 1.*,
pwstore-fast == 2.*,
- regex-posix >= 0.95 && < 1,
- snap-core >= 0.9 && < 0.10,
- snap-server >= 0.9 && < 0.10,
+ regex-posix >= 0.95 && < 1,
+ snap-core >= 0.10 && < 0.11,
+ snap-server >= 0.10 && < 0.11,
stm >= 2.4,
syb >= 0.1,
test-framework >= 0.6 && < 0.7,
@@ -48,7 +48,7 @@ Executable snap-testsuite
transformers >= 0.2,
unix >= 2.2.0.0 && < 2.7,
unordered-containers >= 0.1.4,
- xmlhtml >=0.2.0.3,
+ xmlhtml >= 0.2.0.3,
template-haskell
extensions:
@@ -99,8 +99,8 @@ Executable app
mtl >= 2,
mwc-random >= 0.8,
process == 1.*,
- snap-core >= 0.9.2 && < 0.10,
- snap-server >= 0.9.2 && < 0.10,
+ snap-core >= 0.10 && < 0.11,
+ snap-server >= 0.10 && < 0.11,
syb >= 0.1,
time >= 1.1,
text >= 0.11 && < 0.12,
@@ -136,38 +136,38 @@ Executable nesttest
main-is: NestTest.hs
build-depends:
- Glob >= 0.5 && < 0.8,
- HUnit >= 1.2 && < 2,
- MonadCatchIO-transformers >= 0.2 && < 0.4,
+ Glob >= 0.5 && < 0.8,
+ HUnit >= 1.2 && < 2,
+ MonadCatchIO-transformers >= 0.2 && < 0.4,
QuickCheck >= 2.3.0.2,
- attoparsec >= 0.10 && < 0.11,
- base >= 4 && < 5,
- bytestring >= 0.9 && < 0.11,
- cereal >= 0.3 && < 0.4,
- clientsession >= 0.7 && < 0.8,
- comonad >= 3.0 && < 3.1,
- configurator >= 0.1 && < 0.3,
+ attoparsec >= 0.10 && < 0.11,
+ base >= 4 && < 5,
+ bytestring >= 0.9 && < 0.11,
+ cereal >= 0.3 && < 0.4,
+ clientsession >= 0.7 && < 0.8,
+ comonad >= 3.0 && < 3.1,
+ configurator >= 0.1 && < 0.3,
containers >= 0.3,
directory,
- directory-tree >= 0.10 && < 0.12,
- dlist >= 0.5 && < 0.6,
- errors >= 1.3.1 && < 1.4,
+ directory-tree >= 0.10 && < 0.12,
+ dlist >= 0.5 && < 0.6,
+ errors >= 1.3.1 && < 1.4,
filepath,
hashable >= 1.1,
- heist >= 0.10 && < 0.11,
- http-conduit >= 1.4 && < 1.7,
- http-types >= 0.6 && < 0.8,
- lens >= 3.7 && < 3.8,
+ heist >= 0.10 && < 0.11,
+ http-conduit >= 1.4 && < 1.7,
+ http-types >= 0.6 && < 0.8,
+ lens >= 3.7 && < 3.8,
mtl >= 2,
mwc-random >= 0.8,
process == 1.*,
- snap-core >= 0.9 && < 0.10,
- snap-server >= 0.9 && < 0.10,
+ snap-core >= 0.10 && < 0.11,
+ snap-server >= 0.10 && < 0.11,
syb >= 0.1,
- test-framework >= 0.6 && <0.7,
- test-framework-hunit >= 0.2.7 && <0.3,
- test-framework-quickcheck2 >= 0.2.12.1 && <0.3,
- text >= 0.11 && < 0.12,
+ test-framework >= 0.6 && < 0.7,
+ test-framework-hunit >= 0.2.7 && < 0.3,
+ test-framework-quickcheck2 >= 0.2.12.1 && < 0.3,
+ text >= 0.11 && < 0.12,
time >= 1.1,
transformers >= 0.2,
unordered-containers >= 0.1.4,
Please sign in to comment.
Something went wrong with that request. Please try again.