Skip to content

Commit 809d1d8

Browse files
JeneaVranceanuJeneaVranceanu
committed
chore: merged with develop
2 parents b1c168d + 9bd3042 commit 809d1d8

File tree

5 files changed

+44
-239
lines changed

5 files changed

+44
-239
lines changed

‎Example/myWeb3Wallet/Podfile‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Example/myWeb3Wallet/Podfile.lock‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎Example/myWeb3Wallet/myWeb3Wallet.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
08D762AA7F8C96F1FEC2BDDA /* Pods_myWeb3Wallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6EB035B54D0DDFE25556549 /* Pods_myWeb3Wallet.framework */; };
11-
1A3D2B3177B96101E5BA3A86 /* Pods_myWeb3WalletTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4590F35DEE4A4CA41141602 /* Pods_myWeb3WalletTests.framework */; };
12-
ADDA7950DDF6B6F2FFB1F198 /* Pods_myWeb3Wallet_myWeb3WalletUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DEF494BADF9FD39D553B87D /* Pods_myWeb3Wallet_myWeb3WalletUITests.framework */; };
10+
D6DD90D22991966100EE140E /* web3swift in Frameworks */ = {isa = PBXBuildFile; productRef = D6DD90D12991966100EE140E /* web3swift */; };
1311
FA5308212721D59B002C1F06 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5308202721D59B002C1F06 /* AppDelegate.swift */; };
1412
FA5308232721D59B002C1F06 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5308222721D59B002C1F06 /* SceneDelegate.swift */; };
1513
FA5308252721D59B002C1F06 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5308242721D59B002C1F06 /* ViewController.swift */; };
@@ -47,14 +45,8 @@
4745

4846
/* Begin PBXFileReference section */
4947
2DEF494BADF9FD39D553B87D /* Pods_myWeb3Wallet_myWeb3WalletUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_myWeb3Wallet_myWeb3WalletUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
50-
5B0E97C0C8FE51D0241E7D19 /* Pods-myWeb3Wallet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-myWeb3Wallet.release.xcconfig"; path = "Target Support Files/Pods-myWeb3Wallet/Pods-myWeb3Wallet.release.xcconfig"; sourceTree = "<group>"; };
51-
600772647D45BC0D702D4137 /* Pods-myWeb3Wallet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-myWeb3Wallet.debug.xcconfig"; path = "Target Support Files/Pods-myWeb3Wallet/Pods-myWeb3Wallet.debug.xcconfig"; sourceTree = "<group>"; };
52-
7574A738941D92CC94F93A9E /* Pods-myWeb3Wallet-myWeb3WalletUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-myWeb3Wallet-myWeb3WalletUITests.release.xcconfig"; path = "Target Support Files/Pods-myWeb3Wallet-myWeb3WalletUITests/Pods-myWeb3Wallet-myWeb3WalletUITests.release.xcconfig"; sourceTree = "<group>"; };
53-
A87A2F63C4B3084139E790F5 /* Pods-myWeb3WalletTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-myWeb3WalletTests.debug.xcconfig"; path = "Target Support Files/Pods-myWeb3WalletTests/Pods-myWeb3WalletTests.debug.xcconfig"; sourceTree = "<group>"; };
5448
D4590F35DEE4A4CA41141602 /* Pods_myWeb3WalletTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_myWeb3WalletTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
55-
D6018FABA256C0117F85A829 /* Pods-myWeb3Wallet-myWeb3WalletUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-myWeb3Wallet-myWeb3WalletUITests.debug.xcconfig"; path = "Target Support Files/Pods-myWeb3Wallet-myWeb3WalletUITests/Pods-myWeb3Wallet-myWeb3WalletUITests.debug.xcconfig"; sourceTree = "<group>"; };
5649
D6EB035B54D0DDFE25556549 /* Pods_myWeb3Wallet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_myWeb3Wallet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
57-
E41A5A8BF0A312348D3C52FD /* Pods-myWeb3WalletTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-myWeb3WalletTests.release.xcconfig"; path = "Target Support Files/Pods-myWeb3WalletTests/Pods-myWeb3WalletTests.release.xcconfig"; sourceTree = "<group>"; };
5850
FA53081D2721D59B002C1F06 /* myWeb3Wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = myWeb3Wallet.app; sourceTree = BUILT_PRODUCTS_DIR; };
5951
FA5308202721D59B002C1F06 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
6052
FA5308222721D59B002C1F06 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -82,42 +74,27 @@
8274
isa = PBXFrameworksBuildPhase;
8375
buildActionMask = 2147483647;
8476
files = (
85-
08D762AA7F8C96F1FEC2BDDA /* Pods_myWeb3Wallet.framework in Frameworks */,
77+
D6DD90D22991966100EE140E /* web3swift in Frameworks */,
8678
);
8779
runOnlyForDeploymentPostprocessing = 0;
8880
};
8981
FA5308302721D59D002C1F06 /* Frameworks */ = {
9082
isa = PBXFrameworksBuildPhase;
9183
buildActionMask = 2147483647;
9284
files = (
93-
1A3D2B3177B96101E5BA3A86 /* Pods_myWeb3WalletTests.framework in Frameworks */,
9485
);
9586
runOnlyForDeploymentPostprocessing = 0;
9687
};
9788
FA53083A2721D59D002C1F06 /* Frameworks */ = {
9889
isa = PBXFrameworksBuildPhase;
9990
buildActionMask = 2147483647;
10091
files = (
101-
ADDA7950DDF6B6F2FFB1F198 /* Pods_myWeb3Wallet_myWeb3WalletUITests.framework in Frameworks */,
10292
);
10393
runOnlyForDeploymentPostprocessing = 0;
10494
};
10595
/* End PBXFrameworksBuildPhase section */
10696

10797
/* Begin PBXGroup section */
108-
40AC3854191B335F2FCA6C71 /* Pods */ = {
109-
isa = PBXGroup;
110-
children = (
111-
600772647D45BC0D702D4137 /* Pods-myWeb3Wallet.debug.xcconfig */,
112-
5B0E97C0C8FE51D0241E7D19 /* Pods-myWeb3Wallet.release.xcconfig */,
113-
D6018FABA256C0117F85A829 /* Pods-myWeb3Wallet-myWeb3WalletUITests.debug.xcconfig */,
114-
7574A738941D92CC94F93A9E /* Pods-myWeb3Wallet-myWeb3WalletUITests.release.xcconfig */,
115-
A87A2F63C4B3084139E790F5 /* Pods-myWeb3WalletTests.debug.xcconfig */,
116-
E41A5A8BF0A312348D3C52FD /* Pods-myWeb3WalletTests.release.xcconfig */,
117-
);
118-
path = Pods;
119-
sourceTree = "<group>";
120-
};
12198
B67819FA7D92C1562AFD65A8 /* Frameworks */ = {
12299
isa = PBXGroup;
123100
children = (
@@ -135,7 +112,6 @@
135112
FA5308362721D59D002C1F06 /* myWeb3WalletTests */,
136113
FA5308402721D59D002C1F06 /* myWeb3WalletUITests */,
137114
FA53081E2721D59B002C1F06 /* Products */,
138-
40AC3854191B335F2FCA6C71 /* Pods */,
139115
B67819FA7D92C1562AFD65A8 /* Frameworks */,
140116
);
141117
sourceTree = "<group>";
@@ -227,17 +203,18 @@
227203
isa = PBXNativeTarget;
228204
buildConfigurationList = FA5308472721D59D002C1F06 /* Build configuration list for PBXNativeTarget "myWeb3Wallet" */;
229205
buildPhases = (
230-
2C189F9EA9914E3A42777867 /* [CP] Check Pods Manifest.lock */,
231206
FA5308192721D59B002C1F06 /* Sources */,
232207
FA53081A2721D59B002C1F06 /* Frameworks */,
233208
FA53081B2721D59B002C1F06 /* Resources */,
234-
5E0CBD27780EAD115251C9AC /* [CP] Embed Pods Frameworks */,
235209
);
236210
buildRules = (
237211
);
238212
dependencies = (
239213
);
240214
name = myWeb3Wallet;
215+
packageProductDependencies = (
216+
D6DD90D12991966100EE140E /* web3swift */,
217+
);
241218
productName = myWeb3Wallet;
242219
productReference = FA53081D2721D59B002C1F06 /* myWeb3Wallet.app */;
243220
productType = "com.apple.product-type.application";
@@ -246,7 +223,6 @@
246223
isa = PBXNativeTarget;
247224
buildConfigurationList = FA53084A2721D59D002C1F06 /* Build configuration list for PBXNativeTarget "myWeb3WalletTests" */;
248225
buildPhases = (
249-
342829194E3F4C74B29C947B /* [CP] Check Pods Manifest.lock */,
250226
FA53082F2721D59D002C1F06 /* Sources */,
251227
FA5308302721D59D002C1F06 /* Frameworks */,
252228
FA5308312721D59D002C1F06 /* Resources */,
@@ -265,11 +241,9 @@
265241
isa = PBXNativeTarget;
266242
buildConfigurationList = FA53084D2721D59D002C1F06 /* Build configuration list for PBXNativeTarget "myWeb3WalletUITests" */;
267243
buildPhases = (
268-
5F33F7D7F77389C37C4F1656 /* [CP] Check Pods Manifest.lock */,
269244
FA5308392721D59D002C1F06 /* Sources */,
270245
FA53083A2721D59D002C1F06 /* Frameworks */,
271246
FA53083B2721D59D002C1F06 /* Resources */,
272-
AAF75ECFD98859A6D0818BB6 /* [CP] Embed Pods Frameworks */,
273247
);
274248
buildRules = (
275249
);
@@ -313,6 +287,9 @@
313287
Base,
314288
);
315289
mainGroup = FA5308142721D59B002C1F06;
290+
packageReferences = (
291+
D6DD90D02991966100EE140E /* XCRemoteSwiftPackageReference "web3swift" */,
292+
);
316293
productRefGroup = FA53081E2721D59B002C1F06 /* Products */;
317294
projectDirPath = "";
318295
projectRoot = "";
@@ -355,109 +332,6 @@
355332
};
356333
/* End PBXResourcesBuildPhase section */
357334

358-
/* Begin PBXShellScriptBuildPhase section */
359-
2C189F9EA9914E3A42777867 /* [CP] Check Pods Manifest.lock */ = {
360-
isa = PBXShellScriptBuildPhase;
361-
buildActionMask = 2147483647;
362-
files = (
363-
);
364-
inputFileListPaths = (
365-
);
366-
inputPaths = (
367-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
368-
"${PODS_ROOT}/Manifest.lock",
369-
);
370-
name = "[CP] Check Pods Manifest.lock";
371-
outputFileListPaths = (
372-
);
373-
outputPaths = (
374-
"$(DERIVED_FILE_DIR)/Pods-myWeb3Wallet-checkManifestLockResult.txt",
375-
);
376-
runOnlyForDeploymentPostprocessing = 0;
377-
shellPath = /bin/sh;
378-
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";
379-
showEnvVarsInLog = 0;
380-
};
381-
342829194E3F4C74B29C947B /* [CP] Check Pods Manifest.lock */ = {
382-
isa = PBXShellScriptBuildPhase;
383-
buildActionMask = 2147483647;
384-
files = (
385-
);
386-
inputFileListPaths = (
387-
);
388-
inputPaths = (
389-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
390-
"${PODS_ROOT}/Manifest.lock",
391-
);
392-
name = "[CP] Check Pods Manifest.lock";
393-
outputFileListPaths = (
394-
);
395-
outputPaths = (
396-
"$(DERIVED_FILE_DIR)/Pods-myWeb3WalletTests-checkManifestLockResult.txt",
397-
);
398-
runOnlyForDeploymentPostprocessing = 0;
399-
shellPath = /bin/sh;
400-
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";
401-
showEnvVarsInLog = 0;
402-
};
403-
5E0CBD27780EAD115251C9AC /* [CP] Embed Pods Frameworks */ = {
404-
isa = PBXShellScriptBuildPhase;
405-
buildActionMask = 2147483647;
406-
files = (
407-
);
408-
inputFileListPaths = (
409-
"${PODS_ROOT}/Target Support Files/Pods-myWeb3Wallet/Pods-myWeb3Wallet-frameworks-${CONFIGURATION}-input-files.xcfilelist",
410-
);
411-
name = "[CP] Embed Pods Frameworks";
412-
outputFileListPaths = (
413-
"${PODS_ROOT}/Target Support Files/Pods-myWeb3Wallet/Pods-myWeb3Wallet-frameworks-${CONFIGURATION}-output-files.xcfilelist",
414-
);
415-
runOnlyForDeploymentPostprocessing = 0;
416-
shellPath = /bin/sh;
417-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-myWeb3Wallet/Pods-myWeb3Wallet-frameworks.sh\"\n";
418-
showEnvVarsInLog = 0;
419-
};
420-
5F33F7D7F77389C37C4F1656 /* [CP] Check Pods Manifest.lock */ = {
421-
isa = PBXShellScriptBuildPhase;
422-
buildActionMask = 2147483647;
423-
files = (
424-
);
425-
inputFileListPaths = (
426-
);
427-
inputPaths = (
428-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
429-
"${PODS_ROOT}/Manifest.lock",
430-
);
431-
name = "[CP] Check Pods Manifest.lock";
432-
outputFileListPaths = (
433-
);
434-
outputPaths = (
435-
"$(DERIVED_FILE_DIR)/Pods-myWeb3Wallet-myWeb3WalletUITests-checkManifestLockResult.txt",
436-
);
437-
runOnlyForDeploymentPostprocessing = 0;
438-
shellPath = /bin/sh;
439-
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";
440-
showEnvVarsInLog = 0;
441-
};
442-
AAF75ECFD98859A6D0818BB6 /* [CP] Embed Pods Frameworks */ = {
443-
isa = PBXShellScriptBuildPhase;
444-
buildActionMask = 2147483647;
445-
files = (
446-
);
447-
inputFileListPaths = (
448-
"${PODS_ROOT}/Target Support Files/Pods-myWeb3Wallet-myWeb3WalletUITests/Pods-myWeb3Wallet-myWeb3WalletUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
449-
);
450-
name = "[CP] Embed Pods Frameworks";
451-
outputFileListPaths = (
452-
"${PODS_ROOT}/Target Support Files/Pods-myWeb3Wallet-myWeb3WalletUITests/Pods-myWeb3Wallet-myWeb3WalletUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
453-
);
454-
runOnlyForDeploymentPostprocessing = 0;
455-
shellPath = /bin/sh;
456-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-myWeb3Wallet-myWeb3WalletUITests/Pods-myWeb3Wallet-myWeb3WalletUITests-frameworks.sh\"\n";
457-
showEnvVarsInLog = 0;
458-
};
459-
/* End PBXShellScriptBuildPhase section */
460-
461335
/* Begin PBXSourcesBuildPhase section */
462336
FA5308192721D59B002C1F06 /* Sources */ = {
463337
isa = PBXSourcesBuildPhase;
@@ -642,7 +516,6 @@
642516
};
643517
FA5308482721D59D002C1F06 /* Debug */ = {
644518
isa = XCBuildConfiguration;
645-
baseConfigurationReference = 600772647D45BC0D702D4137 /* Pods-myWeb3Wallet.debug.xcconfig */;
646519
buildSettings = {
647520
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
648521
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -671,7 +544,6 @@
671544
};
672545
FA5308492721D59D002C1F06 /* Release */ = {
673546
isa = XCBuildConfiguration;
674-
baseConfigurationReference = 5B0E97C0C8FE51D0241E7D19 /* Pods-myWeb3Wallet.release.xcconfig */;
675547
buildSettings = {
676548
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
677549
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -700,7 +572,6 @@
700572
};
701573
FA53084B2721D59D002C1F06 /* Debug */ = {
702574
isa = XCBuildConfiguration;
703-
baseConfigurationReference = A87A2F63C4B3084139E790F5 /* Pods-myWeb3WalletTests.debug.xcconfig */;
704575
buildSettings = {
705576
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
706577
BUNDLE_LOADER = "$(TEST_HOST)";
@@ -726,7 +597,6 @@
726597
};
727598
FA53084C2721D59D002C1F06 /* Release */ = {
728599
isa = XCBuildConfiguration;
729-
baseConfigurationReference = E41A5A8BF0A312348D3C52FD /* Pods-myWeb3WalletTests.release.xcconfig */;
730600
buildSettings = {
731601
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
732602
BUNDLE_LOADER = "$(TEST_HOST)";
@@ -752,7 +622,6 @@
752622
};
753623
FA53084E2721D59D002C1F06 /* Debug */ = {
754624
isa = XCBuildConfiguration;
755-
baseConfigurationReference = D6018FABA256C0117F85A829 /* Pods-myWeb3Wallet-myWeb3WalletUITests.debug.xcconfig */;
756625
buildSettings = {
757626
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
758627
CODE_SIGN_STYLE = Automatic;
@@ -776,7 +645,6 @@
776645
};
777646
FA53084F2721D59D002C1F06 /* Release */ = {
778647
isa = XCBuildConfiguration;
779-
baseConfigurationReference = 7574A738941D92CC94F93A9E /* Pods-myWeb3Wallet-myWeb3WalletUITests.release.xcconfig */;
780648
buildSettings = {
781649
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
782650
CODE_SIGN_STYLE = Automatic;
@@ -838,6 +706,25 @@
838706
defaultConfigurationName = Release;
839707
};
840708
/* End XCConfigurationList section */
709+
710+
/* Begin XCRemoteSwiftPackageReference section */
711+
D6DD90D02991966100EE140E /* XCRemoteSwiftPackageReference "web3swift" */ = {
712+
isa = XCRemoteSwiftPackageReference;
713+
repositoryURL = "https://github.com/web3swift-team/web3swift";
714+
requirement = {
715+
kind = upToNextMajorVersion;
716+
minimumVersion = 3.0.0;
717+
};
718+
};
719+
/* End XCRemoteSwiftPackageReference section */
720+
721+
/* Begin XCSwiftPackageProductDependency section */
722+
D6DD90D12991966100EE140E /* web3swift */ = {
723+
isa = XCSwiftPackageProductDependency;
724+
package = D6DD90D02991966100EE140E /* XCRemoteSwiftPackageReference "web3swift" */;
725+
productName = web3swift;
726+
};
727+
/* End XCSwiftPackageProductDependency section */
841728
};
842729
rootObject = FA5308152721D59B002C1F06 /* Project object */;
843730
}

0 commit comments

Comments
 (0)