From c1f5f9d8461e254c0c67c65de36f0860306b3d72 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Wed, 16 Feb 2022 22:38:15 +0000 Subject: [PATCH] flip condition for JSON encoding to make android (tagged objects) default (#319) --- simplexmq.cabal | 4 ++-- src/Simplex/Messaging/Parsers.hs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/simplexmq.cabal b/simplexmq.cabal index 3a5fce63f..22a9005db 100644 --- a/simplexmq.cabal +++ b/simplexmq.cabal @@ -27,8 +27,8 @@ extra-source-files: README.md CHANGELOG.md -if (os(linux)) - ghc-option: -DANDROID +if (os(darwin)) + ghc-option: -DIOS library exposed-modules: diff --git a/src/Simplex/Messaging/Parsers.hs b/src/Simplex/Messaging/Parsers.hs index fc08691d6..410c2e1a8 100644 --- a/src/Simplex/Messaging/Parsers.hs +++ b/src/Simplex/Messaging/Parsers.hs @@ -98,10 +98,10 @@ enumJSON tagModifier = } sumTypeJSON :: (String -> String) -> J.Options -#if defined(ANDROID) -sumTypeJSON = taggedObjectJSON -#else +#if defined(IOS) sumTypeJSON = singleFieldJSON +#else +sumTypeJSON = taggedObjectJSON #endif taggedObjectJSON :: (String -> String) -> J.Options