From 137afb68fe02ac05c439c870db7c626fb6ef7880 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Wed, 16 Feb 2022 08:58:35 +0000 Subject: [PATCH] conditional JSON options for iOS/Android (#318) * conditional JSON options for iOS/Android * update cabal file --- simplexmq.cabal | 3 +++ src/Simplex/Messaging/Parsers.hs | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/simplexmq.cabal b/simplexmq.cabal index 29a5b22d4..bbfecebef 100644 --- a/simplexmq.cabal +++ b/simplexmq.cabal @@ -27,6 +27,9 @@ extra-source-files: README.md CHANGELOG.md +if (os(android)) + ghc-option: -DANDROID + library exposed-modules: Simplex.Messaging.Agent diff --git a/src/Simplex/Messaging/Parsers.hs b/src/Simplex/Messaging/Parsers.hs index 43125b215..fc08691d6 100644 --- a/src/Simplex/Messaging/Parsers.hs +++ b/src/Simplex/Messaging/Parsers.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} @@ -97,7 +98,11 @@ enumJSON tagModifier = } sumTypeJSON :: (String -> String) -> J.Options +#if defined(ANDROID) +sumTypeJSON = taggedObjectJSON +#else sumTypeJSON = singleFieldJSON +#endif taggedObjectJSON :: (String -> String) -> J.Options taggedObjectJSON tagModifier =