IOS-6122: Improve compilation condition naming, fix comments

Signed-off-by: Andrey Fedorov <[email protected]>
tangem · Jun 12, 2024 · 5d316cb · 5d316cb
1 parent 9be3e5e
commit 5d316cb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/tangem-publish.yml b/.github/workflows/tangem-publish.yml
@@ -75,9 +75,8 @@ jobs:
           fetch-tags: true  # Required otherwise git can't describe the repo; Doesn't actually work w/o 'fetch-depth', see https://github.com/actions/checkout/issues/1471
           fetch-depth: 0
 
-      # This header is not used on iOS and causes a compilation error
       - name: Remove unused files
-        run: rm -rf include/TrustWalletCore/TWAnySignerTangem.h
+        run: rm -rf include/TrustWalletCore/TWAnySignerTangem.h  # This header is not used on iOS and causes a compilation error
 
       - name: Check if SwiftProtobuf binary must be updated
         run: tools/check_if_swift_protobuf_should_be_updated "https://github.com/tangem/swift-protobuf-binaries.git" "${{ needs.create_tag_and_release.outputs.swift_protobuf_publish_version }}"

diff --git a/src/interface/TWAnySigner.cpp b/src/interface/TWAnySigner.cpp
@@ -4,11 +4,11 @@
 
 #include <TrustWalletCore/TWAnySigner.h>
 
-#if defined(IS_IOS)
+#if defined(IS_IOS_BINARIES)
 #include <functional>
 #else
-#include <TrustWalletCore/TWAnySignerTangem.h>  // Not used on iOS
-#endif  // defined(IS_IOS)
+#include <TrustWalletCore/TWAnySignerTangem.h>  // This header file is not used on iOS
+#endif  // defined(IS_IOS_BINARIES)
 
 #include "Coin.h"
 

diff --git a/swift/common-xcframework.yml b/swift/common-xcframework.yml
@@ -49,7 +49,7 @@ targets:
       INFOPLIST_FILE: 'Info.plist'
       CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION: YES_ERROR
       CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: $(inherited) false
-      OTHER_CFLAGS: $(inherited) -Wno-comma -DIS_IOS
+      OTHER_CFLAGS: $(inherited) -Wno-comma -DIS_IOS_BINARIES
 
   trezor-crypto:
     type: library.static

diff --git a/swift/project.yml b/swift/project.yml
@@ -54,7 +54,7 @@ targets:
       INFOPLIST_FILE: 'Info.plist'
       CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION: YES_ERROR
       CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: $(inherited) false
-      OTHER_CFLAGS: $(inherited) -Wno-comma -DNDEBUG -DIS_IOS
+      OTHER_CFLAGS: $(inherited) -Wno-comma -DNDEBUG -DIS_IOS_BINARIES
     postCompileScripts:
       - script: |
           export PATH=/opt/homebrew/bin:$PATH;