diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.2, 0.1.3, 0.1.4 - 17.02.2017 +# 0.1.2, 0.1.3, 0.1.4, 0.1.5 - 17.02.2017 - Added manual version bounds to be compatible with stackage and the hackage build (sorry for the version spam) diff --git a/marvin.cabal b/marvin.cabal --- a/marvin.cabal +++ b/marvin.cabal @@ -1,132 +1,147 @@ -name: marvin -version: 0.1.4 -cabal-version: >=1.10 -build-type: Simple -license: BSD3 -license-file: LICENSE -copyright: Copyright: (c) 2016 Justus Adam -maintainer: dev@justus.science -stability: Beta -homepage: https://marvin.readthedocs.io -synopsis: A modular chat bot -description: - A framework for writing portable chat bots. Inspired by hubot. The documentation is on readthedocs: -category: Development -author: JustusAdam -data-files: - initializer/*.hs.mustache - initializer/config.cfg.mustache - initializer/bot.cabal.mustache -data-dir: resources -extra-source-files: - README.md - CHANGELOG.md - preprocessor/Main.mustache - -source-repository head - type: git - location: https://github.com/JustusAdam/marvin +name: marvin +version: 0.1.5 +synopsis: A modular chat bot +description: A framework for writing portable chat bots. Inspired by hubot. The documentation is on readthedocs: +homepage: https://marvin.readthedocs.io +license: BSD3 +license-file: LICENSE +author: JustusAdam +maintainer: dev@justus.science +copyright: Copyright: (c) 2016 Justus Adam +category: Development +stability: Beta +build-type: Simple +extra-source-files: README.md + , CHANGELOG.md + , preprocessor/Main.mustache +data-dir: resources +data-files: initializer/*.hs.mustache + initializer/config.cfg.mustache + initializer/bot.cabal.mustache +cabal-version: >=1.10 library - exposed-modules: - Marvin - Marvin.Prelude - Marvin.Types - Marvin.Run - Marvin.Util.Mutable - Marvin.Util.Regex - Marvin.Util.Random - Marvin.Util.JSON - Marvin.Util.HTTP - Marvin.Adapter - Marvin.Adapter.Shell - Marvin.Adapter.Slack.RTM - Marvin.Adapter.Slack.EventsAPI - Marvin.Adapter.Telegram.Push - Marvin.Adapter.Telegram.Poll - build-depends: - base >=4.7 && <5, - wreq >=0.4 && <0.6, - aeson >=0.11 && <1.2, - mtl >=2.2 && <3, - lens ==4.*, - text-icu >=0.6 && <0.8, - vector >=0.11 && <1, - configurator ==0.3.*, - bytestring ==0.10.*, - monad-logger ==0.3.*, - websockets ==0.9.*, - network-uri >=2.6.1.0 && <2.7, - wuss >=1.0 && <1.2, - random >=1.0 && <1.2, - hashable >=1.0 && <1.3, - text >=1.0 && <1.3, - unordered-containers ==0.2.*, - stm >=2.0 && <2.5, - marvin-interpolate >=1.0 && <1.2, - lifted-base ==0.2.*, - lifted-async >=0.8 && <0.10, - wai ==3.*, - warp ==3.*, - warp-tls ==3.*, - haskeline >=0.7 && <1, - monad-loops ==0.4.*, - time ==1.*, - transformers-base ==0.4.*, - monad-control ==1.*, - deepseq ==1.*, - http-types >=0.8 && <1.0, - http-client >=0.4 && <0.6, - http-client-tls >=0.2 && <0.4, - optparse-applicative >=0.11 && <1, - transformers >=0.4 && <0.6 - default-language: Haskell2010 - default-extensions: OverloadedStrings TypeFamilies - MultiParamTypeClasses TupleSections LambdaCase GADTs - TemplateHaskell QuasiQuotes - hs-source-dirs: src - other-modules: - Util - Marvin.Internal - Marvin.Internal.Types - Marvin.Internal.Values - Marvin.Adapter.Slack.Types - Marvin.Adapter.Slack.Common - Marvin.Adapter.Telegram.Common + hs-source-dirs: src + exposed-modules: Marvin + , Marvin.Prelude + , Marvin.Types + , Marvin.Run + , Marvin.Util.Mutable + , Marvin.Util.Regex + , Marvin.Util.Random + , Marvin.Util.JSON + , Marvin.Util.HTTP + , Marvin.Adapter + , Marvin.Adapter.Shell + , Marvin.Adapter.Slack.RTM + , Marvin.Adapter.Slack.EventsAPI + , Marvin.Adapter.Telegram.Push + , Marvin.Adapter.Telegram.Poll + other-modules: Util + , Marvin.Internal + , Marvin.Internal.Types + , Marvin.Internal.Values + , Marvin.Adapter.Slack.Types + , Marvin.Adapter.Slack.Common + , Marvin.Adapter.Telegram.Common + build-depends: base >= 4.7 && < 5 + , wreq >= 0.4 && < 0.6 + , aeson >= 0.11 && < 1.2 + , mtl >= 2.2 && < 3 + , lens >= 4 && < 5 + , text-icu >= 0.6 && < 0.8 + , vector >= 0.11 && < 1 + , configurator >= 0.3 + , bytestring >= 0.10 + , monad-logger >= 0.3 + , websockets >= 0.9 + , network-uri + , wuss >=1.0 + , random >= 1.0 + , hashable >= 1.0 + , text >= 1.0 + , unordered-containers >= 0.2 + , stm >= 2.0 + , marvin-interpolate >= 1.0 + , lifted-base >= 0.2 + , lifted-async >= 0.8 + , wai >= 3 && < 4 + , warp >= 3 && < 4 + , warp-tls >= 3 && < 4 + , haskeline >= 0.7 && < 1 + , monad-loops >= 0.4 + , time >= 1 && < 2 + , transformers-base >= 0.4 && < 0.5 + , monad-control >= 1 && < 2 + , deepseq >= 1 && < 2 + , http-types >= 0.8 && < 1.0 + , http-client >= 0.4 && < 0.6 + , http-client-tls >= 0.2 && < 0.4 + , optparse-applicative >= 0.11 && < 1 + , transformers >= 0.4 + default-language: Haskell2010 + default-extensions: OverloadedStrings + , TypeFamilies + , MultiParamTypeClasses + , TupleSections + , LambdaCase + , GADTs + , TemplateHaskell + , QuasiQuotes executable marvin-pp - main-is: Main.hs - build-depends: - base >=4.7 && <5, - mustache >=2.0 && <2.2, - directory ==1.2.*, - filepath ==1.4.*, - marvin ==0.1.*, - configurator ==0.3.*, - optparse-applicative >=0.11 && <1, - bytestring ==0.10.*, - text >=1.0 && <1.3, - aeson >=0.11 && <1.2 - default-language: Haskell2010 - default-extensions: OverloadedStrings TypeFamilies - MultiParamTypeClasses TupleSections GADTs - hs-source-dirs: preprocessor - ghc-options: -threaded -rtsopts -with-rtsopts=-N + hs-source-dirs: preprocessor + main-is: Main.hs + ghc-options: -threaded -rtsopts -with-rtsopts=-N + build-depends: base >= 4.7 && < 5 + , mustache >= 2.0 + , directory >= 1.2 + , filepath >= 1.4 + , marvin >= 0.1 + , configurator >= 0.3 + , optparse-applicative >= 0.11 && < 1 + , bytestring >= 0.10 + , text >= 1.0 + , aeson >= 0.11 && < 1.2 + default-language: Haskell2010 + default-extensions: OverloadedStrings + , TypeFamilies + , MultiParamTypeClasses + , TupleSections + , GADTs executable marvin-init - main-is: Main.hs - build-depends: - base >=4.7 && <5, - mustache >=2.0 && <2.2, - directory ==1.2.*, - filepath ==1.4.*, - optparse-applicative >=0.11 && <1, - text >=1.0 && <1.3 - default-language: Haskell2010 - default-extensions: OverloadedStrings TypeFamilies - MultiParamTypeClasses TupleSections GADTs - hs-source-dirs: initializer - other-modules: - Paths_marvin - ghc-options: -threaded -rtsopts -with-rtsopts=-N + hs-source-dirs: initializer + main-is: Main.hs + other-modules: Paths_marvin + ghc-options: -threaded -rtsopts -with-rtsopts=-N + build-depends: base >= 4.7 && < 5 + , mustache >= 2.0 + , directory >= 1.2 + , filepath >= 1.4 + , optparse-applicative >= 0.11 && < 1 + , text >= 1.0 + default-language: Haskell2010 + default-extensions: OverloadedStrings + , TypeFamilies + , MultiParamTypeClasses + , TupleSections + , GADTs +-- test-suite slackbot-framework-test +-- type: exitcode-stdio-1.0 +-- hs-source-dirs: test +-- main-is: Spec.hs +-- build-depends: base +-- , marvin +-- ghc-options: -threaded -rtsopts -with-rtsopts=-N +-- default-language: Haskell2010 +-- default-extensions: OverloadedStrings +-- , TypeFamilies +-- , MultiParamTypeClasses +-- , TupleSections +-- , GADTs + +source-repository head + type: git + location: https://github.com/JustusAdam/marvin