Compare commits

...

2 Commits

Author SHA1 Message Date
Brian Jones
705ce543fb Bump version, add contributor notes 2019-11-06 13:50:55 -09:00
Brian Jones
8d5cc33429 Update library to latest compiler(s)
Built with GHC 8.2.2, 8.4.4, 8.6.5
2019-11-06 13:50:45 -09:00
7 changed files with 59 additions and 30 deletions

View File

@ -0,0 +1,8 @@
user=alasconnect
project=ldap-client
output=CHANGELOG.md
release-branch=master
since-tag=0.2.0
header=# LDAP Client Changelog

View File

@ -1,27 +1,20 @@
language: c language: haskell
sudo: false sudo: false
git:
depth: 5
cache:
directories:
- "$HOME/.cabal/store"
matrix: matrix:
include: include:
- env: CABALVER=1.16 GHCVER=7.6.3 - ghc: 8.0.1
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}} - ghc: 8.2.2
- env: CABALVER=1.18 GHCVER=7.8.4 - ghc: 8.4.4
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}} - ghc: 8.6.5
- env: CABALVER=1.22 GHCVER=7.10.3 RUN_TESTS=--run-tests
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.0.1 RUN_TESTS=--run-tests
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1],sources: [hvr-ghc]}}
- env: CABALVER=head GHCVER=head RUN_TESTS=--run-tests
addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
allow_failures:
- env: CABALVER=1.16 GHCVER=7.6.3 # weird spec problems
- env: CABALVER=1.18 GHCVER=7.8.4 # weird spec problems
- env: CABALVER=head GHCVER=head RUN_TESTS=--run-tests
before_install:
- export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
install: install:
- cabal update - cabal update

View File

@ -1,5 +1,6 @@
next Original Changelog
==== ====
* See `CHANGELOG.md` for recent changes
0.2.0 0.2.0
===== =====

13
CHANGELOG.md Normal file
View File

@ -0,0 +1,13 @@
# LDAP Client Changelog
## [Unreleased](https://github.com/alasconnect/ldap-client/tree/HEAD)
[Full Changelog](https://github.com/alasconnect/ldap-client/compare/0.2.0...HEAD)
**Merged pull requests:**
- Poolable [\#1](https://github.com/alasconnect/ldap-client/pull/1) ([dminuoso](https://github.com/dminuoso))
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

View File

@ -1,30 +1,30 @@
name: ldap-client name: ldap-client
version: 0.2.0 version: 0.3.0
synopsis: Pure Haskell LDAP Client Library synopsis: Pure Haskell LDAP Client Library
description: description:
Pure Haskell LDAP client library implementing (the parts of) RFC 4511. Pure Haskell LDAP client library implementing (the parts of) RFC 4511.
homepage: https://supki.github.io/ldap-client homepage: https://supki.github.io/ldap-client
license: BSD2 license: BSD2
license-file: LICENSE license-file: LICENSE
author: Matvey Aksenov author: Matvey Aksenov, AlasConnect LLC
maintainer: matvey.aksenov@gmail.com maintainer: matvey.aksenov@gmail.com, software@alasconnect.com
copyright: 2015 Matvey Aksenov copyright: 2015 Matvey Aksenov, 2019 AlasConnect LLC
category: Network category: Network
build-type: Simple build-type: Simple
cabal-version: >= 1.10 cabal-version: >= 1.10
tested-with: tested-with:
GHC == 7.6.3 GHC == 8.0.1
, GHC == 7.8.4 , GHC == 8.2.2
, GHC == 7.10.1 , GHC == 8.4.4
, GHC == 8.0.1 , GHC == 8.6.5
extra-source-files: extra-source-files:
README.markdown README.markdown
CHANGELOG.markdown CHANGELOG.markdown
source-repository head source-repository head
type: git type: git
location: git@github.com:supki/ldap-client location: git@github.com:alasconnect/ldap-client
tag: 0.2.0 tag: 0.3.0
library library
ghc-options: ghc-options:
@ -57,6 +57,7 @@ library
, bytestring , bytestring
, connection >= 0.2 , connection >= 0.2
, containers , containers
, fail
, network >= 2.6 , network >= 2.6
, semigroups >= 0.16 , semigroups >= 0.16
, stm , stm

View File

@ -11,6 +11,9 @@ import Control.Applicative (Alternative(..), liftA2, optional)
import Control.Applicative (Applicative(..), Alternative(..), liftA2, optional) import Control.Applicative (Applicative(..), Alternative(..), liftA2, optional)
#endif #endif
import Control.Monad (MonadPlus(..), (>=>), guard) import Control.Monad (MonadPlus(..), (>=>), guard)
#if __GLASGOW_HASKELL__ >= 86
import Control.Monad.Fail (MonadFail, fail)
#endif
import Data.ASN1.Types (ASN1) import Data.ASN1.Types (ASN1)
import qualified Data.ASN1.Types as Asn1 import qualified Data.ASN1.Types as Asn1
import Data.Foldable (asum) import Data.Foldable (asum)
@ -416,6 +419,11 @@ instance MonadPlus (Parser s) where
Parser ma `mplus` Parser mb = Parser ma `mplus` Parser mb =
Parser (\s -> ma s `mplus` mb s) Parser (\s -> ma s `mplus` mb s)
#if __GLASGOW_HASKELL__ >= 86
instance MonadFail (Parser s) where
fail _ = mzero
#endif
parse :: Parser s a -> s -> Maybe (s, a) parse :: Parser s a -> s -> Maybe (s, a)
parse = unParser parse = unParser

View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE NamedFieldPuns #-}
module Ldap.Client.Internal module Ldap.Client.Internal
@ -35,7 +36,11 @@ import Data.ByteString (ByteString)
import Data.List.NonEmpty (NonEmpty) import Data.List.NonEmpty (NonEmpty)
import Data.Text (Text) import Data.Text (Text)
import Data.Typeable (Typeable) import Data.Typeable (Typeable)
#if __GLASGOW_HASKELL__ >= 84
import Network.Socket (PortNumber)
#else
import Network (PortNumber) import Network (PortNumber)
#endif
import Network.Connection (TLSSettings) import Network.Connection (TLSSettings)
import qualified Ldap.Asn1.Type as Type import qualified Ldap.Asn1.Type as Type