Skip to content

Commit

Permalink
Merge pull request #139 from matter-labs/swift5update
Browse files Browse the repository at this point in the history
Swift 5 update
  • Loading branch information
BaldyAsh authored Mar 30, 2019
2 parents dd700be + a89d576 commit e8f7c96
Show file tree
Hide file tree
Showing 186 changed files with 3,762 additions and 8,653 deletions.
18 changes: 8 additions & 10 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
def import_pods
pod 'scrypt', '~> 2.0'
pod "PromiseKit", "~> 6.4.1"
pod 'BigInt', '~> 3.1'
pod 'CryptoSwift', '~> 0.13'
pod 'Result', '~> 4.0'
pod 'PromiseKit', '~> 6.8.3'
pod 'BigInt', '~> 3.1.0'
pod 'CryptoSwift', '~> 0.15.0'
pod 'secp256k1_swift', '~> 1.0.3', :modular_headers => true
pod 'SwiftRLP', '~> 1.1'
pod 'EthereumAddress', '~> 1.0.0'
pod 'EthereumABI', '~>1.1.1'
pod 'SwiftRLP', '~> 1.2'
pod 'EthereumAddress', '~> 1.1.0'
pod 'EthereumABI', '~> 1.2.0'
end

target 'web3swift-macOS' do
platform :osx, '10.11'
platform :osx, '10.12'
# use_frameworks!
use_modular_headers!
import_pods
Expand All @@ -22,7 +20,7 @@ target 'web3swift-macOS' do
end

target 'web3swift-iOS' do
platform :ios, '9.0'
platform :ios, '10.0'
# use_frameworks!
use_modular_headers!
import_pods
Expand Down
59 changes: 25 additions & 34 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,40 +1,35 @@
PODS:
- BigInt (3.1.0):
- SipHash (~> 1.2)
- CryptoSwift (0.13.0)
- EthereumABI (1.1.1):
- CryptoSwift (0.15.0)
- EthereumABI (1.2.0):
- BigInt (~> 3.1)
- CryptoSwift (~> 0.13)
- EthereumAddress (~> 1.0.0)
- EthereumAddress (1.0.0):
- EthereumAddress (~> 1.1.0)
- EthereumAddress (1.1.0):
- CryptoSwift (~> 0.13)
- PromiseKit (6.4.1):
- PromiseKit/CorePromise (= 6.4.1)
- PromiseKit/Foundation (= 6.4.1)
- PromiseKit/UIKit (= 6.4.1)
- PromiseKit/CorePromise (6.4.1)
- PromiseKit/Foundation (6.4.1):
- PromiseKit (6.8.3):
- PromiseKit/CorePromise (= 6.8.3)
- PromiseKit/Foundation (= 6.8.3)
- PromiseKit/UIKit (= 6.8.3)
- PromiseKit/CorePromise (6.8.3)
- PromiseKit/Foundation (6.8.3):
- PromiseKit/CorePromise
- PromiseKit/UIKit (6.4.1):
- PromiseKit/UIKit (6.8.3):
- PromiseKit/CorePromise
- Result (4.0.0)
- scrypt (2.0):
- CryptoSwift (~> 0.11)
- secp256k1_swift (1.0.3)
- SipHash (1.2.2)
- SwiftRLP (1.1):
- SwiftRLP (1.2):
- BigInt (~> 3.1)

DEPENDENCIES:
- BigInt (~> 3.1)
- CryptoSwift (~> 0.13)
- EthereumABI (~> 1.1.1)
- EthereumAddress (~> 1.0.0)
- PromiseKit (~> 6.4.1)
- Result (~> 4.0)
- scrypt (~> 2.0)
- BigInt (~> 3.1.0)
- CryptoSwift (~> 0.15.0)
- EthereumABI (~> 1.2.0)
- EthereumAddress (~> 1.1.0)
- PromiseKit (~> 6.8.3)
- secp256k1_swift (~> 1.0.3)
- SwiftRLP (~> 1.1)
- SwiftRLP (~> 1.2)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
Expand All @@ -43,24 +38,20 @@ SPEC REPOS:
- EthereumABI
- EthereumAddress
- PromiseKit
- Result
- scrypt
- secp256k1_swift
- SipHash
- SwiftRLP

SPEC CHECKSUMS:
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
CryptoSwift: 16e78bebf567bad1c87b2d58f6547f25b74c31aa
EthereumABI: f040f5429e5a4366d028c88b88d9441e137593af
EthereumAddress: f476e1320dca3a0024431e713ede7a09c7eb7796
PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc
Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713
scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84
CryptoSwift: 769f58a9e89f64e8796c2e59ce5f002dc81a2438
EthereumABI: 3e7b3916d8c516c690e3b661ead56652a937cd79
EthereumAddress: 7a948eff69b004daffe719860c772496af4f4fd7
PromiseKit: 94c6e781838c5bf4717677d0d882b0e7250c80fc
secp256k1_swift: 4fc5c4b2d2c6d21ee8ccb868cdc92da12f38bed9
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
SwiftRLP: 5512899925f1a9e1c78c902ed3bf857880e814a0
SwiftRLP: 98a02b2210128353ca02e4c2f4d83e2a9796db4f

PODFILE CHECKSUM: 72534436a5f24d6d07a676642432e134a85ff3e5
PODFILE CHECKSUM: 72e3cc52f1295a9c6966555b3b8d4e6b4e19a4a7

COCOAPODS: 1.5.3
COCOAPODS: 1.7.0.beta.3
30 changes: 20 additions & 10 deletions Pods/CryptoSwift/README.md

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

2 changes: 1 addition & 1 deletion Pods/CryptoSwift/Sources/CryptoSwift/Array+Extension.swift

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

7 changes: 4 additions & 3 deletions Pods/CryptoSwift/Sources/CryptoSwift/BlockDecryptor.swift

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

43 changes: 23 additions & 20 deletions Pods/CryptoSwift/Sources/CryptoSwift/BlockMode/GCM.swift

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

2 changes: 1 addition & 1 deletion Pods/CryptoSwift/Sources/CryptoSwift/Digest.swift

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

Loading

0 comments on commit e8f7c96

Please sign in to comment.