From f495049c52e361d2bbee56a33c0c140e9f22a5bd Mon Sep 17 00:00:00 2001 From: valeriaFireblocks Date: Wed, 5 Jun 2024 16:14:50 +0300 Subject: [PATCH] fix: ios build --- .../project.pbxproj | 211 ++---------------- .../xcshareddata/swiftpm/Package.resolved | 15 ++ ios/ReactNativeNcwSdk.swift | 4 +- 3 files changed, 32 insertions(+), 198 deletions(-) create mode 100644 example/ios/ReactNativeNcwSdkExample.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/example/ios/ReactNativeNcwSdkExample.xcodeproj/project.pbxproj b/example/ios/ReactNativeNcwSdkExample.xcodeproj/project.pbxproj index 48f1a33..3e25339 100644 --- a/example/ios/ReactNativeNcwSdkExample.xcodeproj/project.pbxproj +++ b/example/ios/ReactNativeNcwSdkExample.xcodeproj/project.pbxproj @@ -7,29 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - 00E356F31AD99517003FC87E /* ReactNativeNcwSdkExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ReactNativeNcwSdkExampleTests.m */; }; 0C80B921A6F3F58F76C31292 /* libPods-ReactNativeNcwSdkExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-ReactNativeNcwSdkExample.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2923859A2BD18D1D00BDE940 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 292385992BD18D1D00BDE940 /* GoogleService-Info.plist */; }; 292385A62BD19B6100BDE940 /* FireblocksSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 292385A52BD19B6100BDE940 /* FireblocksSDK */; }; - 7699B88040F8A987B510C191 /* libPods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = ReactNativeNcwSdkExample; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ - 00E356EE1AD99517003FC87E /* ReactNativeNcwSdkExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReactNativeNcwSdkExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* ReactNativeNcwSdkExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactNativeNcwSdkExampleTests.m; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* ReactNativeNcwSdkExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReactNativeNcwSdkExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -50,14 +37,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 00E356EB1AD99517003FC87E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 7699B88040F8A987B510C191 /* libPods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 13B07F8C1A680F5B00A75B9A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -137,7 +116,6 @@ isa = PBXGroup; children = ( 13B07F961A680F5B00A75B9A /* ReactNativeNcwSdkExample.app */, - 00E356EE1AD99517003FC87E /* ReactNativeNcwSdkExampleTests.xctest */, ); name = Products; sourceTree = ""; @@ -156,27 +134,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* ReactNativeNcwSdkExampleTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "ReactNativeNcwSdkExampleTests" */; - buildPhases = ( - A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */, - 00E356EA1AD99517003FC87E /* Sources */, - 00E356EB1AD99517003FC87E /* Frameworks */, - 00E356EC1AD99517003FC87E /* Resources */, - C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */, - F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */, - ); - buildRules = ( - ); - dependencies = ( - 00E356F51AD99517003FC87E /* PBXTargetDependency */, - ); - name = ReactNativeNcwSdkExampleTests; - productName = ReactNativeNcwSdkExampleTests; - productReference = 00E356EE1AD99517003FC87E /* ReactNativeNcwSdkExampleTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; 13B07F861A680F5B00A75B9A /* ReactNativeNcwSdkExample */ = { isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ReactNativeNcwSdkExample" */; @@ -210,10 +167,6 @@ attributes = { LastUpgradeCheck = 1210; TargetAttributes = { - 00E356ED1AD99517003FC87E = { - CreatedOnToolsVersion = 6.2; - TestTargetID = 13B07F861A680F5B00A75B9A; - }; 13B07F861A680F5B00A75B9A = { LastSwiftMigration = 1120; }; @@ -236,19 +189,11 @@ projectRoot = ""; targets = ( 13B07F861A680F5B00A75B9A /* ReactNativeNcwSdkExample */, - 00E356ED1AD99517003FC87E /* ReactNativeNcwSdkExampleTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 00E356EC1AD99517003FC87E /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 13B07F8E1A680F5B00A75B9A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -295,28 +240,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeNcwSdkExample/Pods-ReactNativeNcwSdkExample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -339,23 +262,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; DA9AB9D205C5E4152F4BBCE5 /* [CP-User] [RNFB] Core Configuration */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -386,34 +292,9 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeNcwSdkExample/Pods-ReactNativeNcwSdkExample-resources.sh\"\n"; showEnvVarsInLog = 0; }; - F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests/Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 00E356EA1AD99517003FC87E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 00E356F31AD99517003FC87E /* ReactNativeNcwSdkExampleTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 13B07F871A680F5B00A75B9A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -425,73 +306,17 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* ReactNativeNcwSdkExample */; - targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ - 00E356F61AD99517003FC87E /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests.debug.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = ReactNativeNcwSdkExampleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - OTHER_LDFLAGS = ( - "-ObjC", - "-lc++", - "$(inherited)", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReactNativeNcwSdkExample.app/ReactNativeNcwSdkExample"; - }; - name = Debug; - }; - 00E356F71AD99517003FC87E /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-ReactNativeNcwSdkExample-ReactNativeNcwSdkExampleTests.release.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - COPY_PHASE_STRIP = NO; - INFOPLIST_FILE = ReactNativeNcwSdkExampleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - OTHER_LDFLAGS = ( - "-ObjC", - "-lc++", - "$(inherited)", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReactNativeNcwSdkExample.app/ReactNativeNcwSdkExample"; - }; - name = Release; - }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-ReactNativeNcwSdkExample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 2HS962GC9R; ENABLE_BITCODE = NO; INFOPLIST_FILE = ReactNativeNcwSdkExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -504,8 +329,10 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_BUNDLE_IDENTIFIER = com.fireblocks.ncw.demo.reactNative; PRODUCT_NAME = ReactNativeNcwSdkExample; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "NCW ReactNative Demo"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -518,7 +345,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 2HS962GC9R; INFOPLIST_FILE = ReactNativeNcwSdkExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -530,8 +360,10 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_BUNDLE_IDENTIFIER = com.fireblocks.ncw.demo.reactNative; PRODUCT_NAME = ReactNativeNcwSdkExample; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "NCW ReactNative Demo"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -606,10 +438,7 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -677,10 +506,7 @@ "-DFOLLY_USE_LIBCPP=1", "-DFOLLY_CFG_NO_COROUTINES=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -691,15 +517,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "ReactNativeNcwSdkExampleTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 00E356F61AD99517003FC87E /* Debug */, - 00E356F71AD99517003FC87E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ReactNativeNcwSdkExample" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/example/ios/ReactNativeNcwSdkExample.xcworkspace/xcshareddata/swiftpm/Package.resolved b/example/ios/ReactNativeNcwSdkExample.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..6f64037 --- /dev/null +++ b/example/ios/ReactNativeNcwSdkExample.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,15 @@ +{ + "originHash" : "9cc3f5febb91dd91887536fd8d4bc040d654c230484c5a849508d9fcd5eafc5c", + "pins" : [ + { + "identity" : "ncw-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/fireblocks/ncw-ios-sdk", + "state" : { + "revision" : "cf055fcdcf5d7a47e1e90977e9d486fe462dcbc7", + "version" : "2.5.0" + } + } + ], + "version" : 3 +} diff --git a/ios/ReactNativeNcwSdk.swift b/ios/ReactNativeNcwSdk.swift index d310495..52f5fa3 100644 --- a/ios/ReactNativeNcwSdk.swift +++ b/ios/ReactNativeNcwSdk.swift @@ -323,7 +323,9 @@ class ReactNativeNcwSdk : RCTEventEmitter { let status = instance.getKeysStatus() var response: [String: Any] = [:] for key in status { - response[key.algorithm.rawValue] = try key.asDictionary() + if let algorithm = key.algorithm?.rawValue { + response[algorithm] = try key.asDictionary() + } } resolve(response) } catch let err {