Clean up project and update resolver to 15.7

.gitignore

@@ -1,3 +1,2 @@
 .stack-work/
-haboli.cabal
 *~

CHANGELOG.md

@@ -1,21 +1,22 @@
 # Changelog for haboli
 
 ## upcoming
-* fix nick of example bot in readme
+- clean up project
+- fix nick of example bot in readme
 
 ## 0.3.1.0
-* add `Haboli.Euphoria` module
+- add `Haboli.Euphoria` module
-* add proper README
+- add proper README
-* clean up package structure
+- clean up package structure
-* update documentation
+- update documentation
 
 ## 0.3.0.0
-* fix Client not receiving all kinds of server events
+- fix Client not receiving all kinds of server events
-* rename ConnectionConfig record accessors
+- rename ConnectionConfig record accessors
 
 ## 0.2.0.0
-* add all session and chat room commands
+- add all session and chat room commands
-* modify `send` command so it also returns the old nick
+- modify `send` command so it also returns the old nick
 
 ## 0.1.0.0
-* create project
+- create project

Setup.hs

@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain

haboli.cabal

@@ -0,0 +1,53 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.31.2.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 9b4e31fd51c5402b511dfcd2fa3dd52e562b202b1583f6639a0e193920e0d02c
+
+name:           haboli
+version:        0.3.1.0
+synopsis:       API bindings for https://euphoria.io/
+description:    Please see the README on GitHub at <https://github.com/Garmelon/haboli#readme>
+homepage:       https://github.com/Garmelon/haboli#readme
+bug-reports:    https://github.com/Garmelon/haboli/issues
+author:         Garmelon <joscha@plugh.de>
+maintainer:     Garmelon <joscha@plugh.de>
+copyright:      2020 Garmelon
+license:        MIT
+license-file:   LICENSE
+build-type:     Simple
+extra-source-files:
+    README.md
+    CHANGELOG.md
+    LICENSE
+
+source-repository head
+  type: git
+  location: https://github.com/Garmelon/haboli
+
+library
+  exposed-modules:
+      Haboli.Euphoria
+      Haboli.Euphoria.Api
+      Haboli.Euphoria.Client
+      Haboli.Euphoria.Example
+      Haboli.Euphoria.WegaBorad
+  other-modules:
+      Paths_haboli
+  hs-source-dirs:
+      src
+  build-depends:
+      aeson
+    , base >=4.7 && <5
+    , containers
+    , network
+    , stm
+    , text
+    , time
+    , transformers
+    , unordered-containers
+    , websockets
+    , wuss
+  default-language: Haskell2010

package.yaml

@@ -1,16 +1,17 @@
-name:                haboli
+name: haboli
-version:             0.3.1.0
+version: 0.3.1.0
-license:             MIT
+license: MIT
-author:              "Garmelon <joscha@plugh.de>"
+author: Garmelon <joscha@plugh.de>
-copyright:           "2020 Garmelon"
+copyright: 2020 Garmelon
 
-synopsis:            API bindings for https://euphoria.io/
+synopsis: API bindings for https://euphoria.io/
-description:         Please see the README on GitHub at <https://github.com/Garmelon/haboli#readme>
+description: Please see the README on GitHub at <https://github.com/Garmelon/haboli#readme>
-github:              "Garmelon/haboli"
+github: Garmelon/haboli
 
 extra-source-files:
   - README.md
   - CHANGELOG.md
+  - LICENSE
 
 dependencies:
   - base >= 4.7 && < 5

src/Haboli/Euphoria/Client.hs

@@ -280,7 +280,6 @@ data Event
   | EventSnapshot SnapshotEvent
   deriving (Show)
 
---TODO: Add all the events
 instance FromJSON Event where
   parseJSON v = foldr (<|>) mempty
     [ EventBounce <$> parseJSON v

stack.yaml

@@ -1,66 +1,3 @@
-# This file was automatically generated by 'stack init'
+resolver: lts-15.7
-#
-# Some commonly used options have been documented as comments in this file.
-# For advanced use and comprehensive documentation of the format, please see:
-# https://docs.haskellstack.org/en/stable/yaml_configuration/
-
-# Resolver to choose a 'specific' stackage snapshot or a compiler version.
-# A snapshot resolver dictates the compiler version and the set of packages
-# to be used for project dependencies. For example:
-#
-# resolver: lts-3.5
-# resolver: nightly-2015-09-21
-# resolver: ghc-7.10.2
-#
-# The location of a snapshot can be provided as a file or url. Stack assumes
-# a snapshot provided as a file might change, whereas a url resource does not.
-#
-# resolver: ./custom-snapshot.yaml
-# resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-14.19
-
-# User packages to be built.
-# Various formats can be used as shown in the example below.
-#
-# packages:
-# - some-directory
-# - https://example.com/foo/bar/baz-0.0.2.tar.gz
-#   subdirs:
-#   - auto-update
-#   - wai
 packages:
 - .
-# Dependency packages to be pulled from upstream that are not in the resolver.
-# These entries can reference officially published versions as well as
-# forks / in-progress versions pinned to a git hash. For example:
-#
-# extra-deps:
-# - acme-missiles-0.3
-# - git: https://github.com/commercialhaskell/stack.git
-#   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-#
-# extra-deps: []
-
-# Override default flag values for local packages and extra-deps
-# flags: {}
-
-# Extra package databases containing global packages
-# extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-#
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: ">=2.1"
-#
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-#
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
-#
-# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 524155
+    size: 491389
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/19.yaml
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/7.yaml
-    sha256: 9f79f6494473c9b46911364b94c4b5ef19ca8d35ebf62e46697cf651f198ee19
+    sha256: 92ab6303fe20ec928461c82ce0980b4d17c06f4e66205a2967e476474f686c17
-  original: lts-14.19
+  original: lts-15.7