Skip to content

Commit 55a8b6e

Browse files
committed
bumped resolver got compiling by copying nbloomf#64
1 parent 788f024 commit 55a8b6e

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/Web/Api/WebDriver/Types.hs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The WebDriver protocol involves passing several different kinds of JSON objects.
1212
Note that while the WebDriver spec defines some JSON objects, in general a given WebDriver server can accept additional properties on any given object. Our types here will be limited to the "spec" object signatures, but our API will need to be user extensible.
1313
-}
1414

15-
{-# LANGUAGE OverloadedStrings, RecordWildCards, BangPatterns, CPP #-}
15+
{-# LANGUAGE OverloadedStrings, RecordWildCards, BangPatterns, CPP, FlexibleContexts #-}
1616
module Web.Api.WebDriver.Types (
1717
-- * Stringy Types
1818
SessionId
@@ -149,15 +149,24 @@ malformedValue !name !value = fail $ unpack $
149149
object_ :: [Maybe Pair] -> Value
150150
object_ = object . filter (\(_, v) -> v /= Null) . catMaybes
151151

152+
153+
#if MIN_VERSION_aeson(2,2,0)
154+
(.==) :: (ToJSON v, KeyValue e kv) => Text -> v -> Maybe kv
155+
#else
152156
(.==) :: (ToJSON v, KeyValue kv) => Text -> v -> Maybe kv
157+
#endif
153158
(.==) key value =
154159
#if MIN_VERSION_aeson(2,0,0)
155160
Just ((fromText key) .= value) -- val = lookup (fromText key) obj
156161
#else
157162
Just (key .= value)
158163
#endif
159164

165+
#if MIN_VERSION_aeson(2,2,0)
166+
(.=?) :: (ToJSON v, KeyValue e kv) => Text -> Maybe v -> Maybe kv
167+
#else
160168
(.=?) :: (ToJSON v, KeyValue kv) => Text -> Maybe v -> Maybe kv
169+
#endif
161170
(.=?) key =
162171
#if MIN_VERSION_aeson(2,0,0)
163172
fmap ((fromText key) .=)

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-16.0
1+
resolver: nightly-2024-01-14
22

33
packages:
44
- .

0 commit comments

Comments
 (0)