Merge pull request #122 from 2jacobtan/master

specify version bounds in *.cabal files

gf.cabal

@@ -1,17 +1,16 @@
 name: gf
-version: 3.10.4-git
+version: 3.11.0-git
 
-cabal-version: >= 1.22
+cabal-version: 1.22
 build-type: Custom
 license: OtherLicense
 license-file: LICENSE
 category: Natural Language Processing, Compiler
 synopsis: Grammatical Framework
 description: GF, Grammatical Framework, is a programming language for multilingual grammar applications
-homepage: http://www.grammaticalframework.org/
+homepage: https://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
-maintainer: Thomas Hallgren
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 data-dir: src
 extra-source-files: WebSetup.hs
@@ -74,20 +73,22 @@ flag c-runtime
 
 library
   default-language:    Haskell2010
-  build-depends: base >= 4.6 && <5,
+  build-depends:
-                 array,
+    -- GHC 8.0.2 to GHC 8.10.4
-                 containers,
+    base >= 4.9.1 && <4.15,
-                 bytestring,
+    array >= 0.5.1 && < 0.6,
-                 utf8-string,
+    containers >= 0.5.7 && < 0.7,
-                 random,
+    bytestring >= 0.10.8 && < 0.11,
-                 pretty,
+    utf8-string >= 1.0.1.1 && < 1.1,
-                 mtl,
+    random >= 1.1 && < 1.3,
-                 exceptions,
+    pretty >= 1.1.3 && < 1.2,
-                 fail,
+    mtl >= 2.2.1 && < 2.3,
-                 -- For compatability with ghc < 8
+    -- For compatability with GHC < 8
-                 -- We need transformers-compat >= 0.6.3, but that is only in newer snapshots where it is redundant.
+    exceptions >= 0.8.3 && < 0.11,
-                 transformers-compat,
+    fail >= 4.9.0 && < 4.10,
-                 ghc-prim
+    -- We need transformers-compat >= 0.6.3, but that is only in newer snapshots where it is redundant.
+    transformers-compat >= 0.5.1.4 && < 0.7,
+    ghc-prim >= 0.5.0 && < 0.7
   hs-source-dirs: src/runtime/haskell
 
   other-modules:
@@ -146,8 +147,14 @@ library
 
 ---- GF compiler as a library:
 
-  build-depends: filepath, directory>=1.2, time,
+  build-depends:
-                 process, haskeline, parallel>=3, json
+    filepath >= 1.4.1 && < 1.5,
+    directory >= 1.3.0 && < 1.4,
+    time >= 1.6.0 && < 1.10,
+    process >= 1.4.3 && < 1.7,
+    haskeline >= 0.7.3 && < 0.9,
+    parallel >= 3.2.1.1 && < 3.3,
+    json >= 0.9.1 && < 0.11
 
   hs-source-dirs: src/compiler
   exposed-modules:
@@ -273,12 +280,12 @@ library
     cpp-options: -DC_RUNTIME
 
   if flag(server)
-    build-depends: httpd-shed>=0.4.0.3, network>=2.3 && <2.7,
+    build-depends: httpd-shed >= 0.4.0 && < 0.5, network>=2.3 && <2.7,
-                   cgi>=3001.2.2.0
+                   cgi >= 3001.3.0.2 && < 3001.6
     if flag(network-uri)
-      build-depends: network-uri>=2.6, network>=2.6
+      build-depends: network-uri >= 2.6.1.0 && < 2.7, network>=2.6 && <2.7
     else
-      build-depends: network<2.6
+      build-depends: network >= 2.5 && <2.6
 
     cpp-options: -DSERVER_MODE
     other-modules:
@@ -312,9 +319,9 @@ library
   ghc-options: -fno-warn-tabs
 
   if os(windows)
-    build-depends: Win32
+    build-depends: Win32 >= 2.3.1.1 && < 2.7
   else
-    build-depends: unix, terminfo>=0.4
+    build-depends: unix >= 2.7.2 && < 2.8, terminfo >=0.4.0 && < 0.5
 
   if impl(ghc>=8.2)
     ghc-options: -fhide-source-paths

src/runtime/haskell-bind/pgf2.cabal

@@ -1,18 +1,21 @@
 name: pgf2
 version: 1.3.0
+
+cabal-version: 1.22
+build-type: Simple
+license: LGPL-3
+license-file: LICENSE
+category: Natural Language Processing
 synopsis: Bindings to the C version of the PGF runtime
 description:
   GF, Grammatical Framework, is a programming language for multilingual grammar applications.
   GF grammars are compiled into Portable Grammar Format (PGF) which can be used with the PGF runtime, written in C.
   This package provides Haskell bindings to that runtime.
-homepage: https://www.grammaticalframework.org
+homepage: https://www.grammaticalframework.org/
-license: LGPL-3
+bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
-license-file: LICENSE
 author: Krasimir Angelov
-category: Natural Language Processing
-build-type: Simple
 extra-source-files: CHANGELOG.md, README.md
-cabal-version: >=1.10
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
 
 library
   exposed-modules:
@@ -23,9 +26,9 @@ library
     PGF2.Expr,
     PGF2.Type
   build-depends:
-    base >=4.3 && <5,
+    base >= 4.9.1 && <4.15,
-    containers,
+    containers >= 0.5.7 && < 0.7,
-    pretty
+    pretty >= 1.1.3 && < 1.2
   default-language: Haskell2010
   build-tools: hsc2hs
   extra-libraries: pgf gu

src/runtime/haskell-bind/stack-ghc7.10.3.yaml

@@ -0,0 +1,3 @@
+resolver: lts-6.35 # ghc 7.10.3
+
+allow-newer: true

src/runtime/haskell-bind/stack-ghc8.0.2.yaml

@@ -0,0 +1 @@
+resolver: lts-9.21 # ghc 8.0.2

src/runtime/haskell-bind/stack-ghc8.10.4.yaml

@@ -0,0 +1 @@
+resolver: lts-18.0 # ghc 8.10.4

src/runtime/haskell/pgf.cabal

@@ -1,29 +1,30 @@
 name: pgf
-version: 3.10.1-git
+version: 3.11.0-git
 
-cabal-version: >= 1.20
+cabal-version: 1.22
 build-type: Simple
 license: OtherLicense
 category: Natural Language Processing
 synopsis: Grammatical Framework
 description: A library for interpreting the Portable Grammar Format (PGF)
-homepage: http://www.grammaticalframework.org/
+homepage: https://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
-tested-with: GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2, GHC==8.4.4
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
 
 library
   default-language: Haskell2010
   build-depends:
-    array,
+    base >= 4.9.1 && <4.15,
-    base >= 4.6 && <5,
+    array >= 0.5.1 && < 0.6,
-    bytestring,
+    containers >= 0.5.7 && < 0.7,
-    containers,
+    bytestring >= 0.10.8 && < 0.11,
-    -- exceptions,
+    utf8-string >= 1.0.1.1 && < 1.1,
-    ghc-prim,
+    random >= 1.1 && < 1.3,
-    mtl,
+    pretty >= 1.1.3 && < 1.2,
-    pretty,
+    mtl >= 2.2.1 && < 2.3,
-    random,
+    ghc-prim >= 0.5.0 && < 0.7,
-    utf8-string
+    -- For compatability with GHC < 8
+    fail >= 4.9.0 && < 4.10
 
   other-modules:
     -- not really part of GF but I have changed the original binary library

src/runtime/haskell/stack-ghc7.10.3.yaml

@@ -0,0 +1,3 @@
+resolver: lts-6.35 # ghc 7.10.3
+
+allow-newer: true

src/runtime/haskell/stack-ghc8.0.2.yaml

@@ -0,0 +1 @@
+resolver: lts-9.21 # ghc 8.0.2

src/runtime/haskell/stack-ghc8.10.4.yaml

@@ -0,0 +1 @@
+resolver: lts-18.0 # ghc 8.10.4

stack-ghc8.10.4.yaml

@@ -0,0 +1,14 @@
+resolver: lts-18.0 # ghc 8.10.4
+
+extra-deps:
+- network-2.6.3.6
+- httpd-shed-0.4.0.3
+- cgi-3001.5.0.0@sha256:3d1193a328d5f627a021a0ef3927c1ae41dd341e32dba612fed52d0e3a6df056,2990
+- json-0.10@sha256:d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799,3210
+- multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084
+
+# flags:
+#   gf:
+#     c-runtime: true
+# extra-lib-dirs:
+#   - /usr/local/lib

stack.yaml

@@ -1,13 +1,15 @@
-# This default stack file is a copy of stack-ghc8.6.5.yaml
+# This default stack file is a copy of stack-ghc8.10.4.yaml
 # But committing a symlink can be problematic on Windows, so it's a real copy.
 # See: https://github.com/GrammaticalFramework/gf-core/pull/106
 
-resolver: lts-14.27 # ghc 8.6.5
+resolver: lts-18.0 # ghc 8.10.4
 
 extra-deps:
 - network-2.6.3.6
 - httpd-shed-0.4.0.3
-- cgi-3001.5.0.0
+- cgi-3001.5.0.0@sha256:3d1193a328d5f627a021a0ef3927c1ae41dd341e32dba612fed52d0e3a6df056,2990
+- json-0.10@sha256:d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799,3210
+- multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084
 
 # flags:
 #   gf: