Skip to content

Commit

Permalink
Merge pull request #84 from matterinc/2.0
Browse files Browse the repository at this point in the history
2.0.1
  • Loading branch information
shamatar authored Nov 6, 2018
2 parents e960456 + 38f8caa commit d596ea4
Show file tree
Hide file tree
Showing 197 changed files with 6,651 additions and 5,918 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,4 @@ fastlane/screenshots
fastlane/test_output
API_keys.plist
web3swiftTests/key.json
web3swiftTests/Resources/key.json
3 changes: 2 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ def import_pods
pod 'scrypt', '~> 2.0'
pod "PromiseKit", "~> 6.4.1"
pod 'BigInt', '~> 3.1'
pod 'CryptoSwift', '~> 0.12'
pod 'CryptoSwift', '~> 0.13'
pod 'Result', '~> 4.0'
pod 'secp256k1_swift', '~> 1.0.3', :modular_headers => true
pod 'SwiftRLP', '~> 1.1'
pod 'EthereumAddress', '~> 1.0.0'
pod 'EthereumABI', '~>1.1.1'
end

target 'web3swift-macOS' do
Expand Down
13 changes: 10 additions & 3 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ PODS:
- BigInt (3.1.0):
- SipHash (~> 1.2)
- CryptoSwift (0.13.0)
- EthereumABI (1.1.1):
- BigInt (~> 3.1)
- CryptoSwift (~> 0.13)
- EthereumAddress (~> 1.0.0)
- EthereumAddress (1.0.0):
- CryptoSwift (~> 0.13)
- PromiseKit (6.4.1):
Expand All @@ -23,7 +27,8 @@ PODS:

DEPENDENCIES:
- BigInt (~> 3.1)
- CryptoSwift (~> 0.12)
- CryptoSwift (~> 0.13)
- EthereumABI (~> 1.1.1)
- EthereumAddress (~> 1.0.0)
- PromiseKit (~> 6.4.1)
- Result (~> 4.0)
Expand All @@ -35,6 +40,7 @@ SPEC REPOS:
https://github.com/cocoapods/specs.git:
- BigInt
- CryptoSwift
- EthereumABI
- EthereumAddress
- PromiseKit
- Result
Expand All @@ -46,6 +52,7 @@ SPEC REPOS:
SPEC CHECKSUMS:
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
CryptoSwift: 16e78bebf567bad1c87b2d58f6547f25b74c31aa
EthereumABI: f040f5429e5a4366d028c88b88d9441e137593af
EthereumAddress: f476e1320dca3a0024431e713ede7a09c7eb7796
PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc
Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713
Expand All @@ -54,6 +61,6 @@ SPEC CHECKSUMS:
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
SwiftRLP: 5512899925f1a9e1c78c902ed3bf857880e814a0

PODFILE CHECKSUM: 9f923f3cffffde022aaef140f9cd311a152e9c49
PODFILE CHECKSUM: 72534436a5f24d6d07a676642432e134a85ff3e5

COCOAPODS: 1.6.0.beta.1
COCOAPODS: 1.6.0.beta.2
28 changes: 28 additions & 0 deletions Pods/EthereumABI/EthereumABI/Classes/ABI.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d596ea4

Please sign in to comment.