Skip to content

Commit 21b448e

Browse files
authored
Merge pull request #70 from matterinc/develop
Function visibility fix
2 parents 6480bca + 7d08a89 commit 21b448e

File tree

13 files changed

+66
-343
lines changed

13 files changed

+66
-343
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ def import_pods
55
pod 'CryptoSwift', '~> 0.12'
66
pod 'Result', '~> 4.0'
77
pod 'secp256k1_swift', '~> 1.0.3', :modular_headers => true
8-
pod 'SwiftRLP', '~> 1.0.1'
8+
pod 'SwiftRLP', '~> 1.1'
99
end
1010

1111
target 'web3swift-macOS' do

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PODS:
1616
- CryptoSwift (~> 0.11)
1717
- secp256k1_swift (1.0.3)
1818
- SipHash (1.2.2)
19-
- SwiftRLP (1.0.1):
19+
- SwiftRLP (1.1):
2020
- BigInt (~> 3.1)
2121

2222
DEPENDENCIES:
@@ -26,7 +26,7 @@ DEPENDENCIES:
2626
- Result (~> 4.0)
2727
- scrypt (~> 2.0)
2828
- secp256k1_swift (~> 1.0.3)
29-
- SwiftRLP (~> 1.0.1)
29+
- SwiftRLP (~> 1.1)
3030

3131
SPEC REPOS:
3232
https://github.com/cocoapods/specs.git:
@@ -47,8 +47,8 @@ SPEC CHECKSUMS:
4747
scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84
4848
secp256k1_swift: 4fc5c4b2d2c6d21ee8ccb868cdc92da12f38bed9
4949
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
50-
SwiftRLP: 9de2c9512a9a6bf0909cd84cc143a7ff1aff7820
50+
SwiftRLP: 5512899925f1a9e1c78c902ed3bf857880e814a0
5151

52-
PODFILE CHECKSUM: c1d9470cb065e1f6c00709092108f522105e869f
52+
PODFILE CHECKSUM: 2664c33ef7c46c222ed5963c84c7ebd86a806b9e
5353

5454
COCOAPODS: 1.6.0.beta.2

Pods/Manifest.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/SwiftRLP/Classes/RLP.swift

Lines changed: 18 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web3swift.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "web3swift"
3-
s.version = "1.1.10"
3+
s.version = "1.5.1"
44
s.summary = "Web3 implementation in vanilla Swift for iOS ans macOS"
55

66
s.description = <<-DESC
@@ -28,5 +28,5 @@ s.dependency 'CryptoSwift', '~> 0.11'
2828
s.dependency 'PromiseKit', '~> 6.3'
2929
s.dependency 'scrypt', '~> 2.0'
3030
s.dependency 'secp256k1_swift', '~> 1.0.3'
31-
s.dependency 'SwiftRLP', '~> 1.0.1'
31+
s.dependency 'SwiftRLP', '~> 1.1'
3232
end

web3swift.xcodeproj/project.pbxproj

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
0073F22620D949F7000791F1 /* BlockExplorer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0073F22520D949F7000791F1 /* BlockExplorer.swift */; };
11-
0073F22820D94A11000791F1 /* BlockExplorer+GetTransactionHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0073F22720D94A11000791F1 /* BlockExplorer+GetTransactionHistory.swift */; };
1210
00E5FE7620EA34370030E0D6 /* web3swift_keystores_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E5FE7520EA34370030E0D6 /* web3swift_keystores_Tests.swift */; };
1311
00E5FE7A20EA355D0030E0D6 /* web3swift_transactions_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E5FE7920EA355D0030E0D6 /* web3swift_transactions_Tests.swift */; };
1412
00E5FE7C20EA37B50030E0D6 /* web3swift_ERC20_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E5FE7B20EA37B50030E0D6 /* web3swift_ERC20_Tests.swift */; };
@@ -232,8 +230,6 @@
232230
/* End PBXContainerItemProxy section */
233231

234232
/* Begin PBXFileReference section */
235-
0073F22520D949F7000791F1 /* BlockExplorer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockExplorer.swift; sourceTree = "<group>"; };
236-
0073F22720D94A11000791F1 /* BlockExplorer+GetTransactionHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BlockExplorer+GetTransactionHistory.swift"; sourceTree = "<group>"; };
237233
00E5FE7520EA34370030E0D6 /* web3swift_keystores_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_keystores_Tests.swift; sourceTree = "<group>"; };
238234
00E5FE7920EA355D0030E0D6 /* web3swift_transactions_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_transactions_Tests.swift; sourceTree = "<group>"; };
239235
00E5FE7B20EA37B50030E0D6 /* web3swift_ERC20_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_ERC20_Tests.swift; sourceTree = "<group>"; };
@@ -426,23 +422,6 @@
426422
/* End PBXFrameworksBuildPhase section */
427423

428424
/* Begin PBXGroup section */
429-
0073F22320D949D7000791F1 /* BlockExplorer */ = {
430-
isa = PBXGroup;
431-
children = (
432-
0073F22420D949E8000791F1 /* Classes */,
433-
);
434-
path = BlockExplorer;
435-
sourceTree = "<group>";
436-
};
437-
0073F22420D949E8000791F1 /* Classes */ = {
438-
isa = PBXGroup;
439-
children = (
440-
0073F22520D949F7000791F1 /* BlockExplorer.swift */,
441-
0073F22720D94A11000791F1 /* BlockExplorer+GetTransactionHistory.swift */,
442-
);
443-
path = Classes;
444-
sourceTree = "<group>";
445-
};
446425
1CD91AF21FD76910007BFB45 = {
447426
isa = PBXGroup;
448427
children = (
@@ -471,7 +450,6 @@
471450
children = (
472451
8159C50921343EF900197B91 /* PrecompiledContracts */,
473452
81FECD43211ADE20006DA367 /* ObjectiveCbridge */,
474-
0073F22320D949D7000791F1 /* BlockExplorer */,
475453
81A1821220D5A2430016741F /* Promises */,
476454
81C5DA082072542300424CD6 /* ABIv2 */,
477455
81C0FCED20440BDF00D82FAF /* HookedFunctions */,
@@ -1180,8 +1158,6 @@
11801158
8113D2CE1FD7E1590074282C /* EthereumTransaction.swift in Sources */,
11811159
81A1821F20D676BC0016741F /* Promise+Web3+Eth+GetTransactionCount.swift in Sources */,
11821160
81A1821520D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift in Sources */,
1183-
0073F22820D94A11000791F1 /* BlockExplorer+GetTransactionHistory.swift in Sources */,
1184-
0073F22620D949F7000791F1 /* BlockExplorer.swift in Sources */,
11851161
81C0FD012044A89300D82FAF /* Web3+TransactionIntermediate.swift in Sources */,
11861162
81A1823C20D79C270016741F /* Promise+Web3+Eth+Call.swift in Sources */,
11871163
);

0 commit comments

Comments
 (0)