Set version bounds. Set Monomer version to 1.0

2024-09-11 12:05:35 +03:00 · 2021-07-30 23:27:05 -03:00 · 2021-07-30 23:27:05 -03:00 · a38617c313
commit a38617c313
parent d8dd3d9338
4 changed files with 300 additions and 294 deletions
--- a/monomer.cabal
+++ b/monomer.cabal
@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack

 name:           monomer
-version:        0.1.0.0
+version:        1.0.0.0
 synopsis:       GUI Library
 description:    Monomer is an easy to use, cross platform, GUI library for writing Haskell applications.
                It provides a framework similar to the Elm Architecture, allowing to create GUIs functionally using an extensible set of widgets.
@ -147,34 +147,36 @@ library
      cbits/dpi.c
      cbits/fontmanager.c
      cbits/glew.c
+  build-tools:
+      c2hs
  build-depends:
-      JuicyPixels
-    , OpenGL
-    , async
-    , attoparsec
-    , base >=4.7 && <5
-    , bytestring
-    , bytestring-to-vector
-    , containers
-    , data-default
-    , exceptions
-    , extra
-    , formatting
-    , http-client
-    , lens
-    , mtl
-    , nanovg
-    , process
-    , safe
-    , sdl2
-    , stm
-    , text
-    , text-show
-    , time
-    , transformers
-    , unordered-containers
-    , vector
-    , wreq
+      JuicyPixels >=3.2.9 && <3.5
+    , OpenGL ==3.0.*
+    , async >=2.1 && <2.3
+    , attoparsec >=0.12 && <0.15
+    , base >=4.11 && <5
+    , bytestring >=0.10 && <0.12
+    , bytestring-to-vector ==0.3.*
+    , containers >=0.5.11 && <0.7
+    , data-default >=0.5 && <0.8
+    , exceptions ==0.10.*
+    , extra >=1.6 && <1.9
+    , formatting >=6.0 && <8.0
+    , http-client >=0.6 && <0.9
+    , lens >=4.16 && <5.1
+    , mtl >=2.1 && <2.3
+    , nanovg >=0.8 && <1.0
+    , process ==1.6.*
+    , safe ==0.3.*
+    , sdl2 >=2.4.0 && <2.6
+    , stm ==2.5.*
+    , text ==1.2.*
+    , text-show >=3.7 && <3.10
+    , time >=1.9 && <1.13
+    , transformers >=0.5 && <0.7
+    , unordered-containers >=0.2.8 && <0.3
+    , vector >=0.12 && <0.14
+    , wreq >=0.5.2 && <0.6
  if os(windows)
    extra-libraries:
        glew32
@ -194,35 +196,35 @@ executable books
      OverloadedStrings
  ghc-options: -threaded
  build-depends:
-      JuicyPixels
-    , OpenGL
-    , aeson
-    , async
-    , attoparsec
-    , base >=4.7 && <5
-    , bytestring
-    , bytestring-to-vector
-    , containers
-    , data-default
-    , exceptions
-    , extra
-    , formatting
-    , http-client
-    , lens
+      JuicyPixels >=3.2.9 && <3.5
+    , OpenGL ==3.0.*
+    , aeson >=1.4 && <1.6
+    , async >=2.1 && <2.3
+    , attoparsec >=0.12 && <0.15
+    , base >=4.11 && <5
+    , bytestring >=0.10 && <0.12
+    , bytestring-to-vector ==0.3.*
+    , containers >=0.5.11 && <0.7
+    , data-default >=0.5 && <0.8
+    , exceptions ==0.10.*
+    , extra >=1.6 && <1.9
+    , formatting >=6.0 && <8.0
+    , http-client >=0.6 && <0.9
+    , lens >=4.16 && <5.1
    , monomer
-    , mtl
-    , nanovg
-    , process
-    , safe
-    , sdl2
-    , stm
-    , text
-    , text-show
-    , time
-    , transformers
-    , unordered-containers
-    , vector
-    , wreq
+    , mtl >=2.1 && <2.3
+    , nanovg >=0.8 && <1.0
+    , process ==1.6.*
+    , safe ==0.3.*
+    , sdl2 >=2.4.0 && <2.6
+    , stm ==2.5.*
+    , text ==1.2.*
+    , text-show >=3.7 && <3.10
+    , time >=1.9 && <1.13
+    , transformers >=0.5 && <0.7
+    , unordered-containers >=0.2.8 && <0.3
+    , vector >=0.12 && <0.14
+    , wreq >=0.5.2 && <0.6
  default-language: Haskell2010

 executable generative
@ -238,35 +240,35 @@ executable generative
      OverloadedStrings
  ghc-options: -threaded
  build-depends:
-      JuicyPixels
-    , OpenGL
-    , async
-    , attoparsec
-    , base >=4.7 && <5
-    , bytestring
-    , bytestring-to-vector
-    , containers
-    , data-default
-    , exceptions
-    , extra
-    , formatting
-    , http-client
-    , lens
+      JuicyPixels >=3.2.9 && <3.5
+    , OpenGL ==3.0.*
+    , async >=2.1 && <2.3
+    , attoparsec >=0.12 && <0.15
+    , base >=4.11 && <5
+    , bytestring >=0.10 && <0.12
+    , bytestring-to-vector ==0.3.*
+    , containers >=0.5.11 && <0.7
+    , data-default >=0.5 && <0.8
+    , exceptions ==0.10.*
+    , extra >=1.6 && <1.9
+    , formatting >=6.0 && <8.0
+    , http-client >=0.6 && <0.9
+    , lens >=4.16 && <5.1
    , monomer
-    , mtl
-    , nanovg
-    , process
-    , random
-    , safe
-    , sdl2
-    , stm
-    , text
-    , text-show
-    , time
-    , transformers
-    , unordered-containers
-    , vector
-    , wreq
+    , mtl >=2.1 && <2.3
+    , nanovg >=0.8 && <1.0
+    , process ==1.6.*
+    , random >=1.1 && <1.3
+    , safe ==0.3.*
+    , sdl2 >=2.4.0 && <2.6
+    , stm ==2.5.*
+    , text ==1.2.*
+    , text-show >=3.7 && <3.10
+    , time >=1.9 && <1.13
+    , transformers >=0.5 && <0.7
+    , unordered-containers >=0.2.8 && <0.3
+    , vector >=0.12 && <0.14
+    , wreq >=0.5.2 && <0.6
  default-language: Haskell2010

 executable monomer-exe
@ -282,35 +284,35 @@ executable monomer-exe
      OverloadedStrings
  ghc-options: -fwarn-incomplete-patterns -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
  build-depends:
-      JuicyPixels
-    , OpenGL
-    , async
-    , attoparsec
-    , base >=4.7 && <5
-    , bytestring
-    , bytestring-to-vector
-    , containers
-    , data-default
-    , ekg
-    , exceptions
-    , extra
-    , formatting
-    , http-client
-    , lens
+      JuicyPixels >=3.2.9 && <3.5
+    , OpenGL ==3.0.*
+    , async >=2.1 && <2.3
+    , attoparsec >=0.12 && <0.15
+    , base >=4.11 && <5
+    , bytestring >=0.10 && <0.12
+    , bytestring-to-vector ==0.3.*
+    , containers >=0.5.11 && <0.7
+    , data-default >=0.5 && <0.8
+    , ekg >=0.4 && <0.4.1
+    , exceptions ==0.10.*
+    , extra >=1.6 && <1.9
+    , formatting >=6.0 && <8.0
+    , http-client >=0.6 && <0.9
+    , lens >=4.16 && <5.1
    , monomer
-    , mtl
-    , nanovg
-    , process
-    , safe
-    , sdl2
-    , stm
-    , text
-    , text-show
-    , time
-    , transformers
-    , unordered-containers
-    , vector
-    , wreq
+    , mtl >=2.1 && <2.3
+    , nanovg >=0.8 && <1.0
+    , process ==1.6.*
+    , safe ==0.3.*
+    , sdl2 >=2.4.0 && <2.6
+    , stm ==2.5.*
+    , text ==1.2.*
+    , text-show >=3.7 && <3.10
+    , time >=1.9 && <1.13
+    , transformers >=0.5 && <0.7
+    , unordered-containers >=0.2.8 && <0.3
+    , vector >=0.12 && <0.14
+    , wreq >=0.5.2 && <0.6
  default-language: Haskell2010

 executable ticker
@ -325,38 +327,38 @@ executable ticker
      OverloadedStrings
  ghc-options: -threaded
  build-depends:
-      JuicyPixels
-    , OpenGL
-    , aeson
-    , async
-    , attoparsec
-    , base >=4.7 && <5
-    , bytestring
-    , bytestring-to-vector
-    , containers
-    , data-default
-    , exceptions
-    , extra
-    , formatting
-    , http-client
-    , lens
+      JuicyPixels >=3.2.9 && <3.5
+    , OpenGL ==3.0.*
+    , aeson >=1.4 && <1.6
+    , async >=2.1 && <2.3
+    , attoparsec >=0.12 && <0.15
+    , base >=4.11 && <5
+    , bytestring >=0.10 && <0.12
+    , bytestring-to-vector ==0.3.*
+    , containers >=0.5.11 && <0.7
+    , data-default >=0.5 && <0.8
+    , exceptions ==0.10.*
+    , extra >=1.6 && <1.9
+    , formatting >=6.0 && <8.0
+    , http-client >=0.6 && <0.9
+    , lens >=4.16 && <5.1
    , monomer
-    , mtl
-    , nanovg
-    , process
-    , safe
-    , scientific
-    , sdl2
-    , stm
-    , text
-    , text-show
-    , time
-    , transformers
-    , unordered-containers
-    , vector
-    , websockets
-    , wreq
-    , wuss
+    , mtl >=2.1 && <2.3
+    , nanovg >=0.8 && <1.0
+    , process ==1.6.*
+    , safe ==0.3.*
+    , scientific ==0.3.*
+    , sdl2 >=2.4.0 && <2.6
+    , stm ==2.5.*
+    , text ==1.2.*
+    , text-show >=3.7 && <3.10
+    , time >=1.9 && <1.13
+    , transformers >=0.5 && <0.7
+    , unordered-containers >=0.2.8 && <0.3
+    , vector >=0.12 && <0.14
+    , websockets ==0.12.*
+    , wreq >=0.5.2 && <0.6
+    , wuss ==1.1.*
  default-language: Haskell2010

 executable todo
@ -370,34 +372,34 @@ executable todo
      OverloadedStrings
  ghc-options: -threaded
  build-depends:
-      JuicyPixels
-    , OpenGL
-    , async
-    , attoparsec
-    , base >=4.7 && <5
-    , bytestring
-    , bytestring-to-vector
-    , containers
-    , data-default
-    , exceptions
-    , extra
-    , formatting
-    , http-client
-    , lens
+      JuicyPixels >=3.2.9 && <3.5
+    , OpenGL ==3.0.*
+    , async >=2.1 && <2.3
+    , attoparsec >=0.12 && <0.15
+    , base >=4.11 && <5
+    , bytestring >=0.10 && <0.12
+    , bytestring-to-vector ==0.3.*
+    , containers >=0.5.11 && <0.7
+    , data-default >=0.5 && <0.8
+    , exceptions ==0.10.*
+    , extra >=1.6 && <1.9
+    , formatting >=6.0 && <8.0
+    , http-client >=0.6 && <0.9
+    , lens >=4.16 && <5.1
    , monomer
-    , mtl
-    , nanovg
-    , process
-    , safe
-    , sdl2
-    , stm
-    , text
-    , text-show
-    , time
-    , transformers
-    , unordered-containers
-    , vector
-    , wreq
+    , mtl >=2.1 && <2.3
+    , nanovg >=0.8 && <1.0
+    , process ==1.6.*
+    , safe ==0.3.*
+    , sdl2 >=2.4.0 && <2.6
+    , stm ==2.5.*
+    , text ==1.2.*
+    , text-show >=3.7 && <3.10
+    , time >=1.9 && <1.13
+    , transformers >=0.5 && <0.7
+    , unordered-containers >=0.2.8 && <0.3
+    , vector >=0.12 && <0.14
+    , wreq >=0.5.2 && <0.6
  default-language: Haskell2010

 executable tutorial
@ -418,35 +420,35 @@ executable tutorial
      OverloadedStrings
  ghc-options: -threaded
  build-depends:
-      JuicyPixels
-    , OpenGL
-    , async
-    , attoparsec
-    , base >=4.7 && <5
-    , bytestring
-    , bytestring-to-vector
-    , containers
-    , data-default
-    , exceptions
-    , extra
-    , formatting
-    , http-client
-    , lens
+      JuicyPixels >=3.2.9 && <3.5
+    , OpenGL ==3.0.*
+    , async >=2.1 && <2.3
+    , attoparsec >=0.12 && <0.15
+    , base >=4.11 && <5
+    , bytestring >=0.10 && <0.12
+    , bytestring-to-vector ==0.3.*
+    , containers >=0.5.11 && <0.7
+    , data-default >=0.5 && <0.8
+    , exceptions ==0.10.*
+    , extra >=1.6 && <1.9
+    , formatting >=6.0 && <8.0
+    , http-client >=0.6 && <0.9
+    , lens >=4.16 && <5.1
    , monomer
-    , mtl
-    , nanovg
-    , process
-    , random
-    , safe
-    , sdl2
-    , stm
-    , text
-    , text-show
-    , time
-    , transformers
-    , unordered-containers
-    , vector
-    , wreq
+    , mtl >=2.1 && <2.3
+    , nanovg >=0.8 && <1.0
+    , process ==1.6.*
+    , random >=1.1 && <1.3
+    , safe ==0.3.*
+    , sdl2 >=2.4.0 && <2.6
+    , stm ==2.5.*
+    , text ==1.2.*
+    , text-show >=3.7 && <3.10
+    , time >=1.9 && <1.13
+    , transformers >=0.5 && <0.7
+    , unordered-containers >=0.2.8 && <0.3
+    , vector >=0.12 && <0.14
+    , wreq >=0.5.2 && <0.6
  default-language: Haskell2010

 test-suite monomer-test
@ -503,38 +505,36 @@ test-suite monomer-test
      OverloadedStrings
  ghc-options: -threaded -fwarn-incomplete-patterns -rtsopts -with-rtsopts=-N -with-rtsopts=-T
  build-depends:
-      HUnit
-    , JuicyPixels
-    , OpenGL
-    , async
-    , attoparsec
-    , base >=4.7 && <5
-    , bytestring
-    , bytestring-to-vector
-    , call-stack
-    , containers
-    , data-default
-    , directory
-    , exceptions
-    , extra
-    , formatting
-    , hedgehog
-    , hspec
-    , http-client
-    , lens
+      HUnit ==1.6.*
+    , JuicyPixels >=3.2.9 && <3.5
+    , OpenGL ==3.0.*
+    , async >=2.1 && <2.3
+    , attoparsec >=0.12 && <0.15
+    , base >=4.11 && <5
+    , bytestring >=0.10 && <0.12
+    , bytestring-to-vector ==0.3.*
+    , containers >=0.5.11 && <0.7
+    , data-default >=0.5 && <0.8
+    , directory ==1.3.*
+    , exceptions ==0.10.*
+    , extra >=1.6 && <1.9
+    , formatting >=6.0 && <8.0
+    , hspec >=2.4 && <3.0
+    , http-client >=0.6 && <0.9
+    , lens >=4.16 && <5.1
    , monomer
-    , mtl
-    , nanovg
-    , process
-    , safe
-    , sdl2
-    , silently
-    , stm
-    , text
-    , text-show
-    , time
-    , transformers
-    , unordered-containers
-    , vector
-    , wreq
+    , mtl >=2.1 && <2.3
+    , nanovg >=0.8 && <1.0
+    , process ==1.6.*
+    , safe ==0.3.*
+    , sdl2 >=2.4.0 && <2.6
+    , silently ==1.2.*
+    , stm ==2.5.*
+    , text ==1.2.*
+    , text-show >=3.7 && <3.10
+    , time >=1.9 && <1.13
+    , transformers >=0.5 && <0.7
+    , unordered-containers >=0.2.8 && <0.3
+    , vector >=0.12 && <0.14
+    , wreq >=0.5.2 && <0.6
  default-language: Haskell2010
--- a/package.yaml
+++ b/package.yaml
@ -1,5 +1,5 @@
 name: monomer
-version: 0.1.0.0
+version: 1.0.0.0
 github: fjvallarino/monomer
 license: BSD3
 author: Francisco Vallarino
@ -28,42 +28,44 @@ default-extensions:
 - OverloadedStrings

 dependencies:
- async
- attoparsec
- base >= 4.7 && < 5
- bytestring
- bytestring-to-vector
- containers
- data-default
- exceptions
- extra
- formatting
- http-client
- JuicyPixels
- lens
- mtl
- nanovg
- OpenGL
- process
- safe
- sdl2
- stm
- text
- text-show
- time
- transformers
- unordered-containers
- vector
- wreq
+- async >= 2.1 && < 2.3
+- attoparsec >= 0.12 && < 0.15
+- base >= 4.11 && < 5
+- bytestring >= 0.10 && < 0.12
+- bytestring-to-vector >= 0.3 && < 0.4
+- containers >= 0.5.11 && < 0.7
+- data-default >= 0.5 && < 0.8
+- exceptions >= 0.10 && < 0.11
+- extra >= 1.6 && < 1.9
+- formatting >= 6.0 && < 8.0
+- http-client >= 0.6 && < 0.9
+- JuicyPixels >= 3.2.9 && < 3.5
+- lens >= 4.16 && < 5.1
+- mtl >= 2.1 && < 2.3
+- nanovg >= 0.8 && < 1.0
+- OpenGL >= 3.0 && < 3.1
+- process >= 1.6 && < 1.7
+- safe >= 0.3 && < 0.4
+- sdl2 >= 2.4.0 && < 2.6
+- stm >= 2.5 && < 2.6
+- text >= 1.2 && < 1.3
+- text-show >= 3.7 && < 3.10
+- time >= 1.9 && < 1.13
+- transformers >= 0.5 && < 0.7
+- unordered-containers >= 0.2.8 && < 0.3
+- vector >= 0.12 && < 0.14
+- wreq >= 0.5.2 && < 0.6

 library:
  source-dirs: src
  include-dirs: cbits
-  install-includes: fontmanager.h
+  install-includes:
+  - fontmanager.h
  c-sources:
  - cbits/dpi.c
  - cbits/fontmanager.c
  - cbits/glew.c
+  build-tools: c2hs
  cc-options:
  - -fPIC
  ghc-options:
@ -87,8 +89,8 @@ executables:
    - -with-rtsopts=-T

    dependencies:
-    - ekg
-    - lens
+    - ekg >= 0.4 && < 0.4.1
+    - lens >= 4.16 && < 5.1
    - monomer

  books:
@ -97,11 +99,11 @@ executables:
    ghc-options:
    - -threaded
    dependencies:
-    - aeson
-    - lens
+    - aeson >= 1.4 && < 1.6
+    - lens >= 4.16 && < 5.1
    - monomer
-    - text-show
-    - wreq
+    - text-show >= 3.7 && < 3.10
+    - wreq >= 0.5.2 && < 0.6

  generative:
    main: Main.hs
@ -109,10 +111,10 @@ executables:
    ghc-options:
    - -threaded
    dependencies:
-    - lens
+    - lens >= 4.16 && < 5.1
    - monomer
-    - random
-    - text-show
+    - random >= 1.1 && < 1.3
+    - text-show >= 3.7 && < 3.10

  ticker:
    main: Main.hs
@ -120,13 +122,13 @@ executables:
    ghc-options:
    - -threaded
    dependencies:
-    - aeson
-    - lens
+    - aeson >= 1.4 && < 1.6
+    - lens >= 4.16 && < 5.1
    - monomer
-    - scientific
-    - text-show
-    - websockets
-    - wuss
+    - scientific >= 0.3 && < 0.4
+    - text-show >= 3.7 && < 3.10
+    - websockets >= 0.12 && < 0.13
+    - wuss >= 1.1 && < 1.2

  todo:
    main: Main.hs
@ -134,9 +136,9 @@ executables:
    ghc-options:
    - -threaded
    dependencies:
-    - lens
+    - lens >= 4.16 && < 5.1
    - monomer
-    - text-show
+    - text-show >= 3.7 && < 3.10

  tutorial:
    main: Main.hs
@ -144,11 +146,11 @@ executables:
    ghc-options:
    - -threaded
    dependencies:
-    - lens
+    - lens >= 4.16 && < 5.1
    - monomer
-    - random
-    - text-show
-    - time
+    - random >= 1.1 && < 1.3
+    - text-show >= 3.7 && < 3.10
+    - time >= 1.9 && < 1.13

 tests:
  monomer-test:
@ -161,10 +163,10 @@ tests:
    - -with-rtsopts=-N
    - -with-rtsopts=-T
    dependencies:
-    - call-stack
-    - directory
+#    - call-stack
+    - directory >= 1.3 && < 1.4
    - monomer
-    - hedgehog
-    - hspec
-    - HUnit
-    - silently
+#    - hedgehog >= 1.0 && < 1.1
+    - hspec >= 2.4 && < 3.0
+    - HUnit >= 1.6 && < 1.7
+    - silently >= 1.2 && < 1.3
--- a/stack.yaml
+++ b/stack.yaml
@ -39,14 +39,18 @@ resolver: lts-17.6
 # will not be run. This is useful for tweaking upstream packages.
 packages:
 - .
+
 # Dependency packages to be pulled from upstream that are not in the resolver
 # (e.g., acme-missiles-0.3)
 extra-deps:
  - git: https://github.com/fjvallarino/nanovg-hs
-    commit: 2511fd085f71f75d71f22e8a4b4f08be15421337
+    commit: ba8733f58da63e0934b5d2853ed84b71e872e6f1
  - regex-posix-clib-2.7@sha256:998fca06da3d719818f0691ef0b8b9b7375afeea228cb08bd9e2db53f96b0cd7,1232
-# Override default flag values for local packages and extra-deps
-# flags: {}
+
+  # Override default flag values for local packages and extra-deps
+flags:
+  nanovg:
+    stb_truetype: true

 # Extra package databases containing global packages
 # extra-package-dbs: []
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@ -6,15 +6,15 @@
 packages:
 - completed:
    name: nanovg
-    version: 0.7.1.0
+    version: 0.8.0.0
    git: https://github.com/fjvallarino/nanovg-hs
    pantry-tree:
      size: 5654
-      sha256: 40f3b650691a031b917ed3870c535edbd8766deae110d11fc13968ec6010f918
-    commit: 2511fd085f71f75d71f22e8a4b4f08be15421337
+      sha256: 0d0141f6648a61552729545127a8e00777388f964c9c39394185d50852f3195d
+    commit: ba8733f58da63e0934b5d2853ed84b71e872e6f1
  original:
    git: https://github.com/fjvallarino/nanovg-hs
-    commit: 2511fd085f71f75d71f22e8a4b4f08be15421337
+    commit: ba8733f58da63e0934b5d2853ed84b71e872e6f1
 - completed:
    hackage: regex-posix-clib-2.7@sha256:998fca06da3d719818f0691ef0b8b9b7375afeea228cb08bd9e2db53f96b0cd7,1232
    pantry-tree: