Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add basic properties implementation #12

Merged
merged 26 commits into from
Mar 13, 2018
Merged

Add basic properties implementation #12

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d0e07bc
Add basic properties implementation
colonelpanic8 Mar 3, 2018
c0e37f5
Make setters/getters optional to make read/write access configurable
colonelpanic8 Mar 3, 2018
fba80f4
Add make introspection property function
colonelpanic8 Mar 5, 2018
3294dac
Completely refactor method and property lookup system
colonelpanic8 Mar 5, 2018
4f5bfd8
Add introspection interface handling again
colonelpanic8 Mar 5, 2018
2f4044b
Remove InterfaceName from autoMethod arguments
colonelpanic8 Mar 5, 2018
3ac79d4
Fix linting issues
colonelpanic8 Mar 5, 2018
21a2d21
Major version bump
colonelpanic8 Mar 5, 2018
7630a25
Fix export example
colonelpanic8 Mar 5, 2018
f41508e
Add readOnlyProperty
colonelpanic8 Mar 5, 2018
92e4c8f
Convert XXXs to TODO and NOTEs
colonelpanic8 Mar 5, 2018
aff5f85
Reorganize Client.hs
colonelpanic8 Mar 6, 2018
1d89118
Add property retrieval/set functions
colonelpanic8 Mar 6, 2018
a2e9dd9
Expose intropspection object conversions
colonelpanic8 Mar 7, 2018
27b7102
Add improved properties functions
colonelpanic8 Mar 7, 2018
2a59e90
Change setPropertyValue to return maybe
colonelpanic8 Mar 8, 2018
69940a7
Fully export Client object
colonelpanic8 Mar 8, 2018
bcdbf6c
Add dummy method error
colonelpanic8 Mar 7, 2018
1bc17f7
Add a second fromVariant unpack to getPropertyValue
colonelpanic8 Mar 7, 2018
183fd84
Tidy up properties functions
colonelpanic8 Mar 7, 2018
e47326c
Fix introspection tests
colonelpanic8 Mar 7, 2018
5d8e670
Fix all tests
colonelpanic8 Mar 8, 2018
fd544aa
Add explicit imports for old versions of haskell
colonelpanic8 Mar 8, 2018
e0ffa7a
Get rid of ambiguities in old versions of haskell
colonelpanic8 Mar 8, 2018
4007cfa
Remove travis builds for old versions of haskell
colonelpanic8 Mar 9, 2018
5b625ba
Fix examples
colonelpanic8 Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,6 @@ cache:
# addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
matrix:
include:
# We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
# https://github.com/hvr/multi-ghc-travis
#- env: BUILD=cabal GHCVER=7.0.4 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
# compiler: ": #GHC 7.0.4"
# addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
#- env: BUILD=cabal GHCVER=7.2.2 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
# compiler: ": #GHC 7.2.2"
# addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
#- env: BUILD=cabal GHCVER=7.4.2 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
# compiler: ": #GHC 7.4.2"
# addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
#- env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
# compiler: ": #GHC 7.6.3"
# addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
#- env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7
# compiler: ": #GHC 7.8.4"
# addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
- env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
Expand All @@ -72,14 +55,6 @@ matrix:
compiler: ": #stack default"
addons: {apt: {packages: [libgmp-dev]}}

- env: BUILD=stack ARGS="--resolver lts-2"
compiler: ": #stack 7.8.4"
addons: {apt: {packages: [libgmp-dev]}}

- env: BUILD=stack ARGS="--resolver lts-3"
compiler: ": #stack 7.10.2"
addons: {apt: {packages: [libgmp-dev]}}

- env: BUILD=stack ARGS="--resolver lts-6"
compiler: ": #stack 7.10.3"
addons: {apt: {packages: [libgmp-dev]}}
Expand Down
4 changes: 3 additions & 1 deletion dbus.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: dbus
version: 0.10.15
version: 1.0.0
license: GPL-3
license-file: license.txt
author: John Millikin <john@john-millikin.com>
Expand Down Expand Up @@ -84,10 +84,12 @@ library
, cereal
, containers
, deepseq
, lens
, libxml-sax
, network
, parsec
, random
, split
, text
, transformers
, unix
Expand Down
4 changes: 2 additions & 2 deletions examples/introspect.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ printMethod method = do
printMethodArg :: I.MethodArg -> IO ()
printMethodArg arg = do
let dir = case I.methodArgDirection arg of
d | d == I.directionIn -> "IN "
d | d == I.directionOut -> "OUT"
d | d == I.In -> "IN "
d | d == I.Out -> "OUT"
_ -> " "
putStr (" [" ++ dir ++ " ")
putStr (show (formatSignature (signature_ [I.methodArgType arg])) ++ "] ")
Expand Down
Loading